fixing merge conflicts

docs/production/index.rst

@@ -185,7 +185,11 @@ sensitive nature of Lemur and what it controls makes this essential. This is a s
         }
 
         location / {
+<<<<<<< HEAD
             root /path/to/lemur/static/dist;
+=======
+            root /www/lemur/lemur/static/dist;
+>>>>>>> f679392c610c0cb1f7fb61986f30bf8db3c53054
             include mime.types;
             index index.html;
         }

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.