public/index.html

@@ -8,10 +8,6 @@
 	<meta name="keywords" content="">
 	<meta name="author" content="">
 	<meta name="viewport" content="width=device-width, initial-scale=1.0">
-<<<<<<< HEAD
-    <!--for demonstration:-->
-    <meta http-equiv="refresh" content="10">
-=======
 	<!-- <meta http-equiv="refresh" content="30"> -->
 
 	<!-- NOTE: Define Theme Color -->
@@ -28,7 +24,6 @@
 	<meta name="msapplication-square310x310logo" content="icon_largetile.png">
 	<meta name="msapplication-wide310x150logo" content="icon_widetile.png">
 
->>>>>>> 7a6d46c85b54e576ce552e15a8938291ab2fd22f
 	<!-- NOTE: iOS - Add to Homescreen -->
 	<!-- Hide Safari UI Components -->
 	<meta name="apple-mobile-web-app-capable" content="yes" />