diff options
Diffstat (limited to 'report.sh')
| -rwxr-xr-x[-rw-r--r--] | report.sh | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/report.sh b/report.sh index cbf7c52..b648550 100644..100755 --- a/report.sh +++ b/report.sh @@ -4,13 +4,11 @@ echo "" shortname = `param sname` cat ./fileparts/header.html -<<<<<<< HEAD echo "<!--" set echo "Sname: $FORM_sname" echo "-->" cat ./fileparts/report.html -======= echo "<!--" @@ -25,5 +23,4 @@ else echo "Method was: $REQUEST_METHOD" cat ./fileparts/report.html fi ->>>>>>> development cat ./fileparts/footer.html |