From 2b3633b107b7875a5fb8b639c7d24aca7466145b Mon Sep 17 00:00:00 2001 From: Joseph Schorr Date: Wed, 4 Nov 2015 16:20:45 -0500 Subject: [PATCH] Remove the used_legacy_github column --- .../versions/73669db7e12_remove_legacy_github_column.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/data/migrations/versions/73669db7e12_remove_legacy_github_column.py b/data/migrations/versions/73669db7e12_remove_legacy_github_column.py index 38698c5eb..e6ee5d040 100644 --- 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! ###