From 7e99c05e87c6f35234b6d4a63e15dc7d13d1f7b0 Mon Sep 17 00:00:00 2001
From: Sam Wenham <sam@wenhams.co.uk>
Date: Sat, 22 Aug 2015 13:28:17 +0100
Subject: [PATCH] tidy up after merge

---
 localsettingspotatohut.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/localsettingspotatohut.py b/localsettingspotatohut.py
index f60db84..89cd8a0 100644
--- a/localsettingspotatohut.py
+++ b/localsettingspotatohut.py
@@ -48,11 +48,8 @@ MEDIA_URL = '/' + DIR_ROOT + 'site_media/'
 MEDIA_ROOT = REPOS_ROOT_PATH + '/troggle/media/'
 MEDIA_ADMIN_DIR = '/usr/lib/python2.7/site-packages/django/contrib/admin/media/'
 
-<<<<<<< local
 JSLIB_PATH = '/usr/share/javascript/'
-=======
 JSLIB_URL = URL_ROOT + 'javascript/'
->>>>>>> other
 
 TINY_MCE_MEDIA_ROOT = '/usr/share/tinymce/www/'
 TINY_MCE_MEDIA_URL = URL_ROOT + DIR_ROOT + 'tinymce_media/'