merge master

Toolwatchapp · Apr 20, 2016 · c91295f · c91295f
2 parents a5a15f6 + 80d901c
commit c91295f
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/application/views/header.php b/application/views/header.php
@@ -91,7 +91,6 @@
         <script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
     <![endif]-->
 
-
     <script type="text/javascript">
       window.onerror = function(message, file, line) {
         $.post( "https://"+window.location.hostname+ "/ajax/reportClientError", { error:  file + "(" + line + "): "
@@ -124,6 +123,10 @@
   </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">