diff --git a/localsettingspotatohut.py b/localsettingspotatohut.py
index e5e91d6..f60db84 100644
--- a/localsettingspotatohut.py
+++ b/localsettingspotatohut.py
@@ -9,7 +9,7 @@ DATABASES = {
         'ENGINE': 'django.db.backends.mysql', # Add 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'.
         'NAME': 'troggle',                    # Or path to database file if using sqlite3.
         'USER': 'expo',                       # Not used with sqlite3.
-        'PASSWORD': 'wibble',                 # Not used with sqlite3.
+        'PASSWORD': 'notarealpassword',                 # Not used with sqlite3.
         'HOST': '',                           # Set to empty string for localhost. Not used with sqlite3.
         'PORT': '',                           # Set to empty string for default. Not used with sqlite3.
     }
@@ -48,7 +48,11 @@ 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/'