adding some modification Relates #15

FACG4 · May 23, 2018 · 9647169 · 9647169
1 parent c342eab
commit 9647169
Showing 1 changed file with 2 additions and 11 deletions.
diff --git a/public/navbar.html b/public/navbar.html
@@ -181,20 +181,11 @@
 
   <button type="button" name="generate-code">Generate Code</button>
 
-  <footer></footer>
-<<<<<<< HEAD
   <script type="text/javascript" src="./js/navbarDom.js"></script>
   <script type="text/javascript" src="./js/fonteditor.js"></script>
 
-=======
-  <script type="text/javascript" src="./js/css_writer.js">
-  </script>
-  <script type="text/javascript" src="./js/navbarDom.js">
-  </script>
-  <script type="text/javascript" src="./js/fonteditor.js"></script>
-  <script type="text/javascript" src="./js/coloreditor.js"></script>
-  <script type="text/javascript" src="./js/hovoreditor.js"></script>
->>>>>>> e4c9670c381dec7441acffdf9165260e0782c6e2
+  <footer></footer>
+
 </body>
 
 </html>