# HEAD detached at eb16433
# You are currently rebasing branch 'review/endre_karlson/bp/s' on 'eb16433'.
#   (fix conflicts and then run "git rebase --continue")
#   (use "git rebase --skip" to skip this patch)
#   (use "git rebase --abort" to check out the original branch)
#
# Unmerged paths:
#   (use "git reset HEAD <file>..." to unstage)
#   (use "git add <file>..." to mark resolution)
#
#       added by us:        designate/backend/__init__.py
#       added by us:        designate/quota/impl_noop.py
#       added by us:        designate/storage/__init__.py
#       added by us:        designate/storage/impl_sqlalchemy/migrate_repo/versions/005_records_allow_null_ttl.py
#       both modified:      designate/tests/__init__.py
#       both modified:      designate/tests/test_backend/test_nsd4slave.py
#       added by us:        designate/tests/test_schema/__init__.py
#       added by us:        designate/wsgi.py