Fix merge conflict in comments migration

comments/migrations/0005_merge_20161219_2126.py

+# -*- 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 = [
+    ]

submissions/models.py

@@ -63,8 +63,6 @@ SUBMISSION_STATUS_PUBLICLY_UNLISTED = [
     'withdrawn',
 ]
 
-<<<<<<< HEAD
-=======
 # Submissions which should not be viewable (except by admins, Fellows and authors)
 SUBMISSION_STATUS_PUBLICLY_INVISIBLE = [
     'unassigned',
@@ -88,7 +86,6 @@ SUBMISSION_STATUS_PUBLICLY_INVISIBLE = [
 #     ('Decision_to_authors', 'Editor-in-charge forwards decision to authors'),
 #     )
 
->>>>>>> bd85dfe03971d0905f0879386499e8fa0371b6a9
 SUBMISSION_TYPE = (
     ('Letter', 'Letter (broad-interest breakthrough results)'),
     ('Article', 'Article (in-depth reports on specialized research)'),

theses/views.py

@@ -206,12 +206,7 @@ def thesis_detail(request, thesislink_id):
             new_comment.save()
             author.nr_comments = Comment.objects.filter(author=author).count()
             author.save()
-<<<<<<< HEAD
             request.session['thesislink_id'] = thesislink_id
-            context = {}
-=======
-            #request.session['thesislink_id'] = thesislink_id
-            #return HttpResponseRedirect(reverse('comments:comment_submission_ack'))
             context = {'ack_header': 'Thank you for contributing a Comment.',
                        'ack_message': 'It will soon be vetted by an Editor.',
                        'followup_message': 'Back to the ',
@@ -220,8 +215,7 @@ def thesis_detail(request, thesislink_id):
                            kwargs={'thesislink_id': newcomment.thesislink.id}
                        ),
                        'followup_link_label': ' Thesis Link page you came from'
-                   }
->>>>>>> bd85dfe03971d0905f0879386499e8fa0371b6a9
+            }
             return render(request, 'scipost/acknowledgement.html', context)
     else:
         form = CommentForm()