merge last conflict

realms/commands.py

@@ -14,8 +14,10 @@ import pip
 from realms import config, create_app, db, __version__, cli, cache
 from realms.lib.util import random_string, in_virtualenv, green, yellow, red
 
+
 config = config.conf
 
+
 # called to discover commands in modules
 app = create_app()
 

realms/modules/auth/ldap/views.py

@@ -1,15 +1,11 @@
-<<<<<<< HEAD
-from flask import current_app, request, redirect, Blueprint, flash, url_for, session
-from ..ldap.models import User
-=======
 from __future__ import absolute_import
 
-from flask import current_app, request, redirect, Blueprint, flash, url_for
->>>>>>> systematic use of `from __future__ import absolute_import`. it eliminates `import NAME` confusion with very common names (eg. `import ldap` is very ambiguous: can be a ldap module from realms-wiki, a ldap module from flask-ldap-login, or `python-ldap` module.
+from flask import current_app, request, redirect, Blueprint, flash, url_for, session
 from flask_ldap_login import LDAPLoginForm
 
 from .models import User
 
+
 blueprint = Blueprint('auth.ldap', __name__)