bringing gh-pages to parity with simple master... part 2

cameronwp · Jun 21, 2014 · 73c6181 · 73c6181
1 parent fabf54a
commit 73c6181
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/project-2048.html b/project-2048.html
@@ -21,13 +21,8 @@
       ga('create', 'UA-XXXX-Y');
       ga('send', 'pageview');
     </script>
-<<<<<<< HEAD
-    <script src="http://www.google-analytics.com/analytics.js"></script>
-    <script async src="js/perfmatters.js"></script>
-=======
     <script src="//www.google-analytics.com/analytics.js"></script>
     <script src="js/perfmatters.js"></script>
->>>>>>> f6bd15c5805d7c533f184130bd4c95826094f639
   </head>
 
   <body>