From 1ae82044a68efc2b8f6cc5377fdb7d52874cafad Mon Sep 17 00:00:00 2001
From: Jorran de Wit <jorrandewit@outlook.com>
Date: Tue, 31 Jan 2017 13:11:27 +0100
Subject: [PATCH] Removed duplicate merge in comments
---
.../migrations/0004_auto_20161213_1208.py | 35 -------------------
.../migrations/0005_merge_20161219_2126.py | 16 ---------
2 files changed, 51 deletions(-)
delete mode 100644 comments/migrations/0004_auto_20161213_1208.py
delete mode 100644 comments/migrations/0005_merge_20161219_2126.py
diff --git a/comments/migrations/0004_auto_20161213_1208.py b/comments/migrations/0004_auto_20161213_1208.py
deleted file mode 100644
index 95ab361f1..000000000
--- a/comments/migrations/0004_auto_20161213_1208.py
+++ /dev/null
@@ -1,35 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.10.3 on 2016-12-13 11:08
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('comments', '0003_auto_20160404_2150'),
- ]
-
- operations = [
- migrations.AlterField(
- model_name='comment',
- name='in_agreement',
- field=models.ManyToManyField(blank=True, related_name='in_agreement', to='scipost.Contributor'),
- ),
- migrations.AlterField(
- model_name='comment',
- name='in_disagreement',
- field=models.ManyToManyField(blank=True, related_name='in_disagreement', to='scipost.Contributor'),
- ),
- migrations.AlterField(
- model_name='comment',
- name='in_notsure',
- field=models.ManyToManyField(blank=True, related_name='in_notsure', to='scipost.Contributor'),
- ),
- migrations.AlterField(
- model_name='comment',
- name='is_cor',
- field=models.BooleanField(default=False, verbose_name='correction/erratum'),
- ),
- ]
diff --git a/comments/migrations/0005_merge_20161219_2126.py b/comments/migrations/0005_merge_20161219_2126.py
deleted file mode 100644
index f604a8605..000000000
--- a/comments/migrations/0005_merge_20161219_2126.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.10.3 on 2016-12-19 20:26
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('comments', '0004_auto_20161212_1931'),
- ('comments', '0004_auto_20161213_1208'),
- ]
-
- operations = [
- ]
--
GitLab