forked from ScoDoc/ScoDoc
oubli
This commit is contained in:
parent
6acba813c1
commit
8b98a0bc63
@ -1,5 +1,3 @@
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
# -*- mode: python -*-
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
@ -29,7 +27,6 @@
|
||||
import re
|
||||
import requests
|
||||
|
||||
>>>>>>> e0be0f8feef8cfb7f5da4fe516b33529ec1712c9
|
||||
from flask_wtf import FlaskForm
|
||||
from flask_wtf.file import FileField, FileAllowed, FileRequired
|
||||
from markupsafe import Markup
|
||||
|
Loading…
Reference in New Issue
Block a user