solve conflict

spaun299 · Jul 21, 2015 · 6ee4d4f · 6ee4d4f
2 parents 4e45c4c + d1796b6
commit 6ee4d4f
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/profapp/templates/index.html b/profapp/templates/index.html
@@ -16,7 +16,7 @@
 
 
 
-    <script src="../static/js/ados_002.js" async="" type="text/javascript">   </script><script src="../static/js/quant.js" async=""></script><script src="../static/js/beacon.js" async=""></script><script src="../static/js/analytics.js" async=""></script><script src="../static/js/ados.js" async="" type="text/javascript"></script><script src="../static/js/jquery.js"></script>
+    <script src="../static/js/ados_002.js" async="" type="text/javascript"></script><script src="../static/js/quant.js" async=""></script><script src="../static/js/beacon.js" async=""></script><script src="../static/js/analytics.js" async=""></script><script src="../static/js/ados.js" async="" type="text/javascript"></script><script src="../static/js/jquery.js"></script>
     <script src="../static/js/stub.js"></script>
     <link rel="stylesheet" type="text/css" href="../static/css/all.css">
 

diff --git a/profapp/templates/index_[file_manager].html b/profapp/templates/index_[file_manager].html
@@ -0,0 +1,16 @@
+<!doctype html>
+<html lang="en">
+<head>
+  <!--
+    * Angular FileManager v1.0.1 (https://github.com/joni2back/angular-filemanager)
+    * Jonas Sciangula Street <[email protected]>
+    * Licensed under MIT (https://github.com/joni2back/angular-filemanager/blob/master/LICENSE)
+  -->
+  <title>Profireader</title>
+    <a href="{{ url_for('filemanager.filemanager') }}">Filemanager</a>
+</head>
+
+<body>
+
+</body>
+</html>