fixing merge conflict

2015-08-09 16:52:14 -07:00 · 2015-08-09 16:52:14 -07:00 · b8720566d7
commit b8720566d7
parent d0d3e06c81
1 changed files with 0 additions and 4 deletions
--- a/docs/production/index.rst
+++ b/docs/production/index.rst
@ -185,11 +185,7 @@ 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;
        }