fixing merge conflicts

2015-08-09 16:51:25 -07:00
parent 48f38a8625 f679392c61
commit d0d3e06c81
2 changed files with 10 additions and 0 deletions
--- a/docs/quickstart/index.rst
+++ b/docs/quickstart/index.rst
@ -194,6 +194,12 @@ You'll use the builtin HttpProxyModule within Nginx to handle proxying
        index index.html;
    }

+    location / {
+        root /www/lemur/lemur/static/dist;
+        include mime.types;
+        index index.html;
+    }
+
 See :doc:`../production/index` for more details on using Nginx.