Revert "Merge pull request #3 from nowmozillaclub/master"

This reverts commit 6e20c1b, reversing changes made to 68c3c8e.
nowmozillaclub · Oct 1, 2018 · d57b6ca · d57b6ca
1 parent 3a42fe0
commit d57b6ca
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/app/routes.py b/app/routes.py
@@ -28,7 +28,11 @@ def before_request():
         db.session.commit()
         g.locale = str(get_locale())
 
+<<<<<<< HEAD
 @app.route('/')
+=======
+@app.route('/', methods=['GET', 'POST'])
+>>>>>>> parent of 6e20c1b... Merge pull request #3 from nowmozillaclub/master
 @app.route('/index', methods=['GET', 'POST'])
 @login_required
 def index():

diff --git a/requirements.txt b/requirements.txt
@@ -18,7 +18,7 @@ itsdangerous==0.24
 Jinja2==2.10
 Mako==1.0.7
 MarkupSafe==1.0
-psycopg2==2.7.5
+psycopg2==2.7.4
 PyJWT==1.6.1
 python-dateutil==2.7.2
 python-editor==1.0.3