Move v1 checksums to image and track v2 separately

2015-11-04 16:18:53 -05:00 · 2015-11-04 16:18:53 -05:00 · 3d0bcbaaeb
commit 3d0bcbaaeb
parent 2b3633b107
8 changed files with 65 additions and 17 deletions
--- a/data/migrations/versions/73669db7e12_remove_legacy_github_column.py
+++ b/data/migrations/versions/73669db7e12_remove_legacy_github_column.py
@ -12,10 +12,6 @@ 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! ###