X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Fconf.py;h=8c621357b7962387109480b0e4fa478dc90f4947;hb=99c3a7054b2789bc007e9fdfe57c7ae68a9a7459;hp=9c70d9713977836a8e0f7696f177805cb7b920f2;hpb=1609f84764026eb0d9a7ea12a419c96883bd9ddf;p=csit.git

diff --git a/resources/tools/presentation/conf.py b/resources/tools/presentation/conf.py
index 9c70d97139..8c621357b7 100644
--- a/resources/tools/presentation/conf.py
+++ b/resources/tools/presentation/conf.py
@@ -46,6 +46,9 @@ source_suffix = [u'.rst', u'.md']
 master_doc = u'index'
 
 # General information about the project.
+<<<<<<< HEAD   (953d13 Report: Fix typo in specification.)
+<<<<<<< HEAD   (793b6b Report: Add data)
+<<<<<<< HEAD   (b95753 PAL: Fix table data model)
 <<<<<<< HEAD   (ede849 Report: Add pdf version)
 <<<<<<< HEAD   (35a360 Report: Add data)
 =======
@@ -57,13 +60,28 @@ report_week = u'13'
 <<<<<<< HEAD   (d4f9e9 CSIT-1597 API cleanup: acl)
 report_week = u'12'
 =======
+=======
+<<<<<<< HEAD   (9b9bbb PAL: Fix table data model)
+>>>>>>> CHANGE (8f2816 Report: Configure report 2001.16)
 report_week = u'14'
+<<<<<<< HEAD   (b95753 PAL: Fix table data model)
 >>>>>>> CHANGE (0ed80e Report: COnfigure reoirt 2001.14)
 >>>>>>> CHANGE (bdfc93 Report: COnfigure reoirt 2001.14)
 =======
 report_week = u'15'
 >>>>>>> CHANGE (8e601d Report: Configure report 2001.15)
 >>>>>>> CHANGE (68013a Report: Configure report 2001.15)
+=======
+=======
+report_week = u'16'
+>>>>>>> CHANGE (42a491 Report: Configure report 2001.16)
+>>>>>>> CHANGE (8f2816 Report: Configure report 2001.16)
+=======
+report_week = u'18'
+>>>>>>> CHANGE (dfd4a2 Report: Configure Report 2001.18)
+=======
+report_week = u'19'
+>>>>>>> CHANGE (413f1d Report: Configure report 2001.19)
 project = u'FD.io CSIT-2001.{week}'.format(week=report_week)
 copyright = u'2020, FD.io'
 author = u'FD.io CSIT'