diff options
Diffstat (limited to 'resources')
| -rw-r--r-- | resources/tools/presentation/conf.py | 4 | ||||
| -rwxr-xr-x | resources/tools/presentation/run_report.sh | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/resources/tools/presentation/conf.py b/resources/tools/presentation/conf.py index 26431469b6..8c621357b7 100644 --- a/resources/tools/presentation/conf.py +++ b/resources/tools/presentation/conf.py @@ -46,6 +46,7 @@ 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) @@ -78,6 +79,9 @@ report_week = u'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' diff --git a/resources/tools/presentation/run_report.sh b/resources/tools/presentation/run_report.sh index 3dcd1ada7c..9a611c52e0 100755 --- a/resources/tools/presentation/run_report.sh +++ b/resources/tools/presentation/run_report.sh @@ -38,6 +38,7 @@ export PYTHONPATH=`pwd`:`pwd`/../../../:`pwd`/../../libraries/python python pal.py \ --specification specification.yaml \ --release ${RELEASE} \ +<<<<<<< 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) @@ -70,6 +71,9 @@ python pal.py \ ======= --week "18" \ >>>>>>> CHANGE (dfd4a2 Report: Configure Report 2001.18) +======= + --week "19" \ +>>>>>>> CHANGE (413f1d Report: Configure report 2001.19) --logging INFO \ --force |