Index: lams_tool_assessment/web/pages/learning/results.jsp
===================================================================
diff -u -r139e91caa1fc95af99802e31cb3a4b57ef7ebc5e -r2738fbf4093242e8352672d8db79b7e91d59d12d
--- lams_tool_assessment/web/pages/learning/results.jsp	(.../results.jsp)	(revision 139e91caa1fc95af99802e31cb3a4b57ef7ebc5e)
+++ lams_tool_assessment/web/pages/learning/results.jsp	(.../results.jsp)	(revision 2738fbf4093242e8352672d8db79b7e91d59d12d)
@@ -112,11 +112,7 @@
 			<div class="panel">
 				<c:out value="${assessment.instructions}" escapeXml="false"/>
 			</div>
-<<<<<<< HEAD
-		
-=======
-			
->>>>>>> refs/remotes/origin/master
+
 			<div class="form-group">
 				<%@ include file="results/allquestions.jsp"%>