aboutsummaryrefslogtreecommitdiffstats
path: root/resources
diff options
context:
space:
mode:
Diffstat (limited to 'resources')
-rw-r--r--resources/tools/presentation/conf.py45
-rwxr-xr-xresources/tools/presentation/run_report.sh45
2 files changed, 0 insertions, 90 deletions
diff --git a/resources/tools/presentation/conf.py b/resources/tools/presentation/conf.py
index 1c37e47659..d0b5b1b3bb 100644
--- a/resources/tools/presentation/conf.py
+++ b/resources/tools/presentation/conf.py
@@ -46,52 +46,7 @@ source_suffix = [u'.rst', u'.md']
master_doc = u'index'
# General information about the project.
-<<<<<<< HEAD (c842ea Report: Add data)
-<<<<<<< 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)
-=======
-<<<<<<< HEAD (ef4187 Report: Add pdf version)
->>>>>>> CHANGE (68013a Report: Configure report 2001.15)
-report_week = u'13'
-=======
-<<<<<<< HEAD (ede849 Report: Add pdf version)
-<<<<<<< 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)
-=======
-=======
-<<<<<<< HEAD (d5fe67 Report: Add data)
->>>>>>> CHANGE (6df891 Report: Configure report 2001.20)
-report_week = u'18'
-<<<<<<< HEAD (c842ea Report: Add data)
->>>>>>> CHANGE (dfd4a2 Report: Configure Report 2001.18)
-=======
-report_week = u'19'
->>>>>>> CHANGE (413f1d Report: Configure report 2001.19)
-=======
-=======
report_week = u'20'
->>>>>>> CHANGE (f4c460 Report: Configure report 2001.20)
->>>>>>> CHANGE (6df891 Report: Configure report 2001.20)
project = u'FD.io CSIT-2001.{week}'.format(week=report_week)
copyright = u'2020, FD.io'
author = u'FD.io CSIT'
diff --git a/resources/tools/presentation/run_report.sh b/resources/tools/presentation/run_report.sh
index 6149388d91..219e8600c2 100755
--- a/resources/tools/presentation/run_report.sh
+++ b/resources/tools/presentation/run_report.sh
@@ -38,52 +38,7 @@ export PYTHONPATH=`pwd`:`pwd`/../../../:`pwd`/../../libraries/python
python pal.py \
--specification specification.yaml \
--release ${RELEASE} \
-<<<<<<< HEAD (c842ea Report: Add data)
-<<<<<<< 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)
-=======
-<<<<<<< HEAD (ef4187 Report: Add pdf version)
->>>>>>> CHANGE (68013a Report: Configure report 2001.15)
- --week "13" \
-=======
-<<<<<<< HEAD (ede849 Report: Add pdf version)
-<<<<<<< HEAD (d4f9e9 CSIT-1597 API cleanup: acl)
- --week "12" \
-=======
-=======
-<<<<<<< HEAD (9b9bbb PAL: Fix table data model)
->>>>>>> CHANGE (8f2816 Report: Configure report 2001.16)
- --week "14" \
-<<<<<<< HEAD (b95753 PAL: Fix table data model)
->>>>>>> CHANGE (0ed80e Report: COnfigure reoirt 2001.14)
->>>>>>> CHANGE (bdfc93 Report: COnfigure reoirt 2001.14)
-=======
- --week "15" \
->>>>>>> CHANGE (8e601d Report: Configure report 2001.15)
->>>>>>> CHANGE (68013a Report: Configure report 2001.15)
-=======
-=======
- --week "16" \
->>>>>>> CHANGE (42a491 Report: Configure report 2001.16)
->>>>>>> CHANGE (8f2816 Report: Configure report 2001.16)
-=======
-=======
-<<<<<<< HEAD (d5fe67 Report: Add data)
->>>>>>> CHANGE (6df891 Report: Configure report 2001.20)
- --week "18" \
-<<<<<<< HEAD (c842ea Report: Add data)
->>>>>>> CHANGE (dfd4a2 Report: Configure Report 2001.18)
-=======
- --week "19" \
->>>>>>> CHANGE (413f1d Report: Configure report 2001.19)
-=======
-=======
--week "20" \
->>>>>>> CHANGE (f4c460 Report: Configure report 2001.20)
->>>>>>> CHANGE (6df891 Report: Configure report 2001.20)
--logging INFO \
--force