Remove merge marker and readd TestingConfig class.

config.py

@@ -28,7 +28,6 @@ class Config:
 class DevelopmentConfig(Config):
     ''' ### Flask ### '''
     DEBUG = True
-<<<<<<< HEAD
     # SQLALCHEMY_DATABASE_URI = 'sqlite:///' + os.path.join(basedir,
     #                                                       'data_dev.sqlite')
     SQLALCHEMY_DATABASE_URI = \
@@ -39,8 +38,6 @@ class DevelopmentConfig(Config):
             port=os.environ.get('POSTGRES_PORT'),
             db=os.environ.get('POSTGRES_DB_NAME'))
     print(SQLALCHEMY_DATABASE_URI)
-=======
->>>>>>> e3db2ecd1e52b4993b91e1a1c3501c0fc775de1d
 
     ''' ### Flask-SQLAlchemy ### '''
     SQLALCHEMY_DATABASE_URI = 'sqlite:///{}'.format(
@@ -49,6 +46,11 @@ class DevelopmentConfig(Config):
     )
 
 
+class TestingConfig(Config):
+    ''' ### Flask-SQLAlchemy ### '''
+    SQLALCHEMY_DATABASE_URI = 'sqlite://'
+
+
 class ProductionConfig(Config):
     ''' ### Flask-SQLAlchemy ### '''
     SQLALCHEMY_DATABASE_URI = os.environ.get('SQLALCHEMY_DATABASE_URI')
@@ -56,12 +58,7 @@ class ProductionConfig(Config):
 
 config = {
     'development': DevelopmentConfig,
-<<<<<<< HEAD
     'testing': TestingConfig,
-    #'production': ProductionConfig,
-
-=======
     'production': ProductionConfig,
->>>>>>> e3db2ecd1e52b4993b91e1a1c3501c0fc775de1d
     'default': DevelopmentConfig
 }