Infra
/
lemur
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixing merge conflict

This commit is contained in:
kevgliss 2015-08-09 16:52:14 -07:00
parent d0d3e06c81
commit b8720566d7
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/production/index.rst
View File

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