fix bug

themis-business/src/main/resources/mapper/TOeExamRecordMapper.xml

@@ -468,9 +468,6 @@
 		where f.paper_id = #{paperId}
 		limit 1
 	</select>
-<<<<<<< HEAD
-	
-=======
 
 	<select id="patrolReport" resultType="com.qmth.themis.business.bean.backend.InvigilateListPatrolReportBean">
 		select
@@ -589,5 +586,4 @@
 		t.roomName
 		order by t.roomCode
 	</select>
->>>>>>> dev
 </mapper>