fix conflicts

[roojs1] / index.html
diff --git a/index.html b/index.html

new file mode 100644 (file)

index 0000000..574dbf6
--- /dev/null
+++ b/index.html
@@ -0,0 +1,10 @@
+<html>
+    
+    <head>
+        <meta http-equiv="refresh" content="0; URL=./docs/index.html" />
+        
+    </head>
+    <body>
+        <a href="docs/index.html">DOCS</a>
+    </body>
+</html>