From 65295b5ace49909e02239ea046c83ae33b9a9e28 Mon Sep 17 00:00:00 2001
From: "J.-S. Caux" <J.S.Caux@uva.nl>
Date: Wed, 23 Mar 2016 08:35:48 +0100
Subject: [PATCH] Correct bugs
---
scipost/templates/scipost/personal_page.html | 4 ----
1 file changed, 4 deletions(-)
diff --git a/scipost/templates/scipost/personal_page.html b/scipost/templates/scipost/personal_page.html
index 2110d6faa..87274d43b 100644
--- a/scipost/templates/scipost/personal_page.html
+++ b/scipost/templates/scipost/personal_page.html
@@ -93,10 +93,6 @@
{% if submission_authorships_to_claim %}
<ul>
{% for sub in submission_authorships_to_claim %}
-<<<<<<< HEAD
-=======
- {{ sub.header_as_li|safe %}
->>>>>>> 81ce5214671e7d42584cfce22a7f0c96c817dd83
{% endfor %}
{% endif %}
<ul>
--
GitLab