Resolved merge conflict

e7d51f02 · YSelf Tool · ed635f35 · a08cf49b · e7d51f02 · ed635f35
Commit e7d51f02 authored Sep 05, 2015 by YSelf Tool
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ __pycache__/
 test.db
 *.pyc
 *.swp
+config.py
--- a/config.py
+++ b/config.py
-SQLALCHEMY_DATABASE_URI = "sqlite:///test.db"
-SECRET_KEY = "iesoogh9jangoocheihoig5iejeenixaingah7NuashahSeechaerohg6ouw9moojei8ahmooPaes1ie"
-DEBUG = True