From b8720566d776cb3216d7fb9c8055ddcdeaaac53a Mon Sep 17 00:00:00 2001
From: kevgliss <kevgliss@gmail.com>
Date: Sun, 9 Aug 2015 16:52:14 -0700
Subject: [PATCH] fixing merge conflict

---
 docs/production/index.rst | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/docs/production/index.rst b/docs/production/index.rst
index 5b82c3a3..8bddb99d 100644
--- 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;
         }