remove empty merge conflict

Toolwatchapp · Apr 20, 2016 · 5651978 · 5651978
1 parent c91295f
commit 5651978
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/application/views/header.php b/application/views/header.php
@@ -123,10 +123,6 @@
   </script>
 <?php } ?>
 
-<<<<<<< HEAD
-=======
-
->>>>>>> 80d901c438419a7c0db002186df0935a3e9a35d3
 </head>
 <body>
 	<div class="modal fade" id="pageModal" tabindex="-1" role="dialog" aria-labelledby="pageModal" aria-hidden="true" data-keyboard="true" data-backdrop="static">