fix tox.ini

Author: tuky

tox.ini

@@ -42,9 +42,6 @@ recreate = False
 commands =
     pip list
     py.test -xv --ignore=t/unit/test_models.py
-
-[testenv:models]
-commands =
     py.test -xv -k 'ModelMigrationTests'
 
 [testenv:upgradebeat111]
@@ -173,9 +170,5 @@ usedevelop = true
 commands =
     pip install -U https://github.com/celery/celery/zipball/master#egg=celery
     pip install -U https://github.com/celery/kombu/zipball/master#egg=kombu
-<<<<<<< HEAD
     pip install Django==2.0
-    py.test -x --cov=django_celery_beat --cov-report=xml --no-cov-on-fail
-=======
     py.test -x --cov=django_celery_beat --cov-report=xml --no-cov-on-fail --ignore=t/unit/test_models.py
->>>>>>> test models with DJANGO_CELERY_BEAT_NAME_MAX_LENGTH=191 in own process; pep8