Merge pull request #1075 from MITx/fix/cdodge/env-bad-checkin

fix edit conflict
2012-11-26 06:44:59 -08:00
parent 4e876b056e 2524cd614a
commit b250cad6ee
1 changed files with 0 additions and 4 deletions
--- a/lms/envs/aws.py
+++ b/lms/envs/aws.py
@@ -19,11 +19,7 @@ EMAIL_BACKEND = 'django_ses.SESBackend'
 SESSION_ENGINE = 'django.contrib.sessions.backends.cache'
 DEFAULT_FILE_STORAGE = 'storages.backends.s3boto.S3BotoStorage'

-<<<<<<< HEAD
-# Disable askbot, enable Berkeley forums
-=======
 # Enable Berkeley forums
->>>>>>> origin/master
 MITX_FEATURES['ENABLE_DISCUSSION_SERVICE'] = True

 # IMPORTANT: With this enabled, the server must always be behind a proxy that