From 996e23b4deb530e82d6beaa958452f3315f0eb69 Mon Sep 17 00:00:00 2001 From: Tibor Frank Date: Thu, 7 May 2020 10:19:56 +0200 Subject: Report: Configure report 2001.20 Change-Id: Ib0a3190dfd5b216aa9ff93d751fa48cd42cef88f Signed-off-by: Tibor Frank (cherry picked from commit f4c4608a348dbff603a75fb59e36e1ee8daa2b2a) (cherry picked from commit 6df8919916d3a50c686822f097dd0ed83cce7884) --- resources/tools/presentation/conf.py | 10 ++++++++++ resources/tools/presentation/run_report.sh | 10 ++++++++++ 2 files changed, 20 insertions(+) (limited to 'resources') diff --git a/resources/tools/presentation/conf.py b/resources/tools/presentation/conf.py index 8c621357b7..1c37e47659 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 (c842ea Report: Add data) <<<<<<< HEAD (953d13 Report: Fix typo in specification.) <<<<<<< HEAD (793b6b Report: Add data) <<<<<<< HEAD (b95753 PAL: Fix table data model) @@ -77,11 +78,20 @@ 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 9a611c52e0..6149388d91 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 (c842ea Report: Add data) <<<<<<< HEAD (953d13 Report: Fix typo in specification.) <<<<<<< HEAD (793b6b Report: Add data) <<<<<<< HEAD (b95753 PAL: Fix table data model) @@ -69,11 +70,20 @@ python pal.py \ >>>>>>> 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 -- cgit 1.2.3-korg