diff --git a/news/migrations/0001_initial.py b/news/migrations/0001_initial.py
index 3b688f4..f638f71 100644
--- a/news/migrations/0001_initial.py
+++ b/news/migrations/0001_initial.py
@@ -1,9 +1,5 @@
 # -*- coding: utf-8 -*-
-<<<<<<< HEAD
-# Generated by Django 1.10.4 on 2017-04-08 01:51
-=======
 # Generated by Django 1.10.4 on 2017-04-08 00:54
->>>>>>> 006b4402f3d2aac21ac5426cd255eec9e5cb69a7
 from __future__ import unicode_literals
 
 import autoslug.fields
--
libgit2 0.21.2