dépôts
/
cavote.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Fix error during merge
[cavote.git]
/
main.py
diff --git
a/main.py
b/main.py
index
3ac3664
..
fc18674
100755
(executable)
--- a/
main.py
+++ b/
main.py
@@
-17,7
+17,8
@@
import string
from settings import *
-app = Flask(__name__) app.config.from_object(__name__)
+app = Flask(__name__)
+app.config.from_object(__name__)
oid = OpenID(app)