sporada/nopaque
1
0
Fork 0
mirror of https://gitlab.ub.uni-bielefeld.de/sfb1288inf/nopaque.git synced 2024-11-15 01:05:42 +00:00
Code Issues Projects Releases Wiki Activity

Fix wrong merge.

Browse Source
This commit is contained in:
Patrick Jentsch 2019-07-08 14:08:11 +02:00
parent d1d5e5f114
commit 59ad0c1668
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/auth/views.py
View File

@ -1,9 +1,5 @@
from flask import flash, redirect, render_template, request, url_for from flask import flash, redirect, render_template, request, url_for
<<<<<<< HEAD
from flask_login import login_required, login_user, logout_user, current_user
=======
from flask_login import current_user, login_required, login_user, logout_user from flask_login import current_user, login_required, login_user, logout_user
>>>>>>> 1a973bfbc68dfea26a8b5360074480641cb34f31
from . import auth from . import auth
from .. import db from .. import db
from .forms import LoginForm, PasswordResetRequestForm, RegistrationForm from .forms import LoginForm, PasswordResetRequestForm, RegistrationForm