fix index addition

millmason · Apr 27, 2016 · 79030fc · 79030fc
1 parent 1a9a754
commit 79030fc
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/index.html b/index.html
@@ -1,7 +1,6 @@
 <!DOCTYPE html>
 <html>
 <head>
-<<<<<<< HEAD
   <meta charset=utf-8 />
   <title>Visualizer</title>
   <script src="app.js" charset="utf-8"></script>
@@ -10,7 +9,6 @@
   <link rel="icon"
         type="image/png"
         href="favicon.ico">
-=======
 <meta charset=utf-8 />
 <title>Visualizer</title>
  <link href='https://fonts.googleapis.com/css?family=Lato:400,100,300' rel='stylesheet' type='text/css'>
@@ -19,7 +17,6 @@
 <link rel="icon"
       type="image/png"
       href="favicon.ico">
->>>>>>> master
 </head>
 <body>
   <div class="modal">