Remove the used_legacy_github column

2015-11-04 16:20:45 -05:00 · 2015-11-04 16:20:45 -05:00 · 2b3633b107
commit 2b3633b107
parent bbf4a1fac4
1 changed files with 4 additions and 0 deletions
--- a/data/migrations/versions/73669db7e12_remove_legacy_github_column.py
+++ b/data/migrations/versions/73669db7e12_remove_legacy_github_column.py
@ -12,6 +12,10 @@ down_revision = '35f538da62'

 from alembic import op
 import sqlalchemy as sa
+<<<<<<< HEAD
+=======
+from sqlalchemy.dialects import mysql
+>>>>>>> Remove the used_legacy_github column

 def upgrade(tables):
    ### commands auto generated by Alembic - please adjust! ###