From ac30638d0a0a8ebc6ccaab4de58e44e7edd942cd Mon Sep 17 00:00:00 2001
From: Alexander Pickering <Apickx@cogarr.org>
Date: Mon, 7 Mar 2016 20:47:41 -0500
Subject: Resolved conflicts

---
 report.sh | 3 ---
 1 file changed, 3 deletions(-)
 mode change 100644 => 100755 report.sh

diff --git a/report.sh b/report.sh
old mode 100644
new mode 100755
index cbf7c52..b648550
--- 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
-- 
cgit v1.2.3-70-g09d2