From 59ad0c16684c4ab5f243e57f332502414201ab0d Mon Sep 17 00:00:00 2001 From: Patrick Jentsch Date: Mon, 8 Jul 2019 14:08:11 +0200 Subject: [PATCH] Fix wrong merge. --- app/auth/views.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/app/auth/views.py b/app/auth/views.py index 69193d56..04afc1e6 100644 --- a/app/auth/views.py +++ b/app/auth/views.py @@ -1,9 +1,5 @@ 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 ->>>>>>> 1a973bfbc68dfea26a8b5360074480641cb34f31 from . import auth from .. import db from .forms import LoginForm, PasswordResetRequestForm, RegistrationForm