diff options
| author | Alexander Pickering <Apickx@cogarr.org> | 2016-03-07 20:47:41 -0500 |
|---|---|---|
| committer | Alexander Pickering <Apickx@cogarr.org> | 2016-03-07 20:47:41 -0500 |
| commit | ac30638d0a0a8ebc6ccaab4de58e44e7edd942cd (patch) | |
| tree | 43030e4d6912cf73886551030a2138e9f81b7aaf | |
| parent | d1a8f02ffd5124203977fc205debbdb6ea174992 (diff) | |
| download | webpage-ac30638d0a0a8ebc6ccaab4de58e44e7edd942cd.tar.gz webpage-ac30638d0a0a8ebc6ccaab4de58e44e7edd942cd.tar.bz2 webpage-ac30638d0a0a8ebc6ccaab4de58e44e7edd942cd.zip | |
Resolved conflicts
| -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 |