Fix compile error in jenkins build
@@ -183,7 +183,6 @@ RECAPTCHA_SITE_KEY = "6LeIxAcTAAAAAJcZVRqyHh71UMIEGNQ_MXjiZKhI"
RECAPTCHA_SECRET_KEY = "6LeIxAcTAAAAAGG-vFI1TnRWxMZNFuojJ4WifJWe"
RECAPTCHA_VERIFY_URL = 'https://www.google.com/recaptcha/api/siteverify'
-<<<<<<< Updated upstream:hydroshare/local_settings.cutover
# insert a google maps key here when in production
MAPS_KEY = ''
