Report: Configure report 2001.20

[csit.git] / resources / tools / presentation / run_report.sh

diff --git a/resources/tools/presentation/run_report.sh b/resources/tools/presentation/run_report.sh
index 5c4dcfd..6149388 100755 (executable)
--- a/resources/tools/presentation/run_report.sh
+++ b/resources/tools/presentation/run_report.sh
@@ -38,6 +38,10 @@ 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)
 =======
@@ -49,13 +53,37 @@ python pal.py \
 <<<<<<< 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