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

Fixing bad cherry pick

Browse Source
This commit is contained in:
kevgliss
2015-07-19 19:28:49 -07:00
parent f78e9d47d1
commit f679392c61
2 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
docs/production/index.rst
View File

@ -106,12 +106,8 @@ You can make some adjustments to get a better user experience::
}
location / {
<<<<<<< HEAD
root /apps/lemur/lemur/static/dist;
=======
root /www/lemur/lemur/static/dist;
include mime.types;
>>>>>>> b978435... Merge pull request #21 from kevgliss/buildfixes
index index.html;
}
@ -176,12 +172,8 @@ sensitive nature of Lemur and what it controls makes this essential. This is a s
}
location / {
<<<<<<< HEAD
root /apps/lemur/lemur/static/dist;
=======
root /www/lemur/lemur/static/dist;
include mime.types;
>>>>>>> b978435... Merge pull request #21 from kevgliss/buildfixes
index index.html;
}