diff options
| author | Sam Wenham <sam@wenhams.co.uk> | 2015-08-22 13:28:17 +0100 |
|---|---|---|
| committer | Sam Wenham <sam@wenhams.co.uk> | 2015-08-22 13:28:17 +0100 |
| commit | 7e99c05e87c6f35234b6d4a63e15dc7d13d1f7b0 (patch) | |
| tree | 2090be083c6c84c41397611b4a9ef20c8f166832 | |
| parent | 223be0454e50be89e522f0eb9d09e9e1e55de653 (diff) | |
| download | troggle-7e99c05e87c6f35234b6d4a63e15dc7d13d1f7b0.tar.gz troggle-7e99c05e87c6f35234b6d4a63e15dc7d13d1f7b0.tar.bz2 troggle-7e99c05e87c6f35234b6d4a63e15dc7d13d1f7b0.zip | |
tidy up after merge
| -rw-r--r-- | localsettingspotatohut.py | 3 |
1 files changed, 0 insertions, 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/' |