aboutsummaryrefslogtreecommitdiffstats
path: root/resources/tools/presentation/run_report.sh
diff options
context:
space:
mode:
Diffstat (limited to 'resources/tools/presentation/run_report.sh')
-rwxr-xr-xresources/tools/presentation/run_report.sh8
1 files changed, 8 insertions, 0 deletions
diff --git a/resources/tools/presentation/run_report.sh b/resources/tools/presentation/run_report.sh
index e4d1802f87..f661c99c7a 100755
--- a/resources/tools/presentation/run_report.sh
+++ b/resources/tools/presentation/run_report.sh
@@ -38,7 +38,15 @@ export PYTHONPATH=`pwd`:`pwd`/../../../:`pwd`/../../libraries/python
python pal.py \
--specification specification.yaml \
--release ${RELEASE} \
+<<<<<<< HEAD (35a360 Report: Add data)
--week "13" \
+=======
+<<<<<<< HEAD (d4f9e9 CSIT-1597 API cleanup: acl)
+ --week "12" \
+=======
+ --week "14" \
+>>>>>>> CHANGE (0ed80e Report: COnfigure reoirt 2001.14)
+>>>>>>> CHANGE (bdfc93 Report: COnfigure reoirt 2001.14)
--logging INFO \
--force