X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Fconf.py;h=07569dcef51e671ce623a3fdaec71d272b4782ac;hb=9a5e9b745df25cff0a23141cbccff83b6a55d2e9;hp=a67b6d5be4a676ad2508c4213c53f5968cdc8210;hpb=35a3602cb35bf73d5697cebd5509a26dcda73268;p=csit.git

diff --git a/resources/tools/presentation/conf.py b/resources/tools/presentation/conf.py
index a67b6d5be4..07569dcef5 100644
--- a/resources/tools/presentation/conf.py
+++ b/resources/tools/presentation/conf.py
@@ -46,7 +46,15 @@ source_suffix = [u'.rst', u'.md']
 master_doc = u'index'
 
 # General information about the project.
+<<<<<<< HEAD   (35a360 Report: Add data)
 report_week = u'13'
+=======
+<<<<<<< HEAD   (d4f9e9 CSIT-1597 API cleanup: acl)
+report_week = u'12'
+=======
+report_week = u'14'
+>>>>>>> CHANGE (0ed80e Report: COnfigure reoirt 2001.14)
+>>>>>>> CHANGE (bdfc93 Report: COnfigure reoirt 2001.14)
 project = u'FD.io CSIT-2001.{week}'.format(week=report_week)
 copyright = u'2020, FD.io'
 author = u'FD.io CSIT'