text: # Copyright 2016 Ifwe Inc.
  #
  # Licensed under the Apache License, Version 2.0 (the "License");
  # you may not use this file except in compliance with the License.
  # You may obtain a copy of the License at
  #
  #     http://www.apache.org/licenses/LICENSE-2.0
  #
  # Unless required by applicable law or agreed to in writing, software
  # distributed under the License is distributed on an "AS IS" BASIS,
  # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  # See the License for the specific language governing permissions and
  # limitations under the License.
  
  """merge master branch into tds-120 branch
  
  Revision ID: b4c9f4a3e166
  Revises: ('13f87d9ec845', '10aa1611b456')
  Create Date: 2016-01-14 15:26:33.944512
  
  """
  
  # revision identifiers, used by Alembic.
  revision = 'b4c9f4a3e166'
  down_revision = ('13f87d9ec845', '10aa1611b456')
  
  from alembic import op
  import sqlalchemy as sa
  
  
  def upgrade():
      pass
  
  
  def downgrade():
      pass
  