Removed junk from repo's Detached Head

templates/sora/profiles/follows.html

@@ -48,12 +48,8 @@
 <div class="list-nav">
   {{ pager() }}
 </div>
-{% else %}
-<<<<<<< HEAD
-<p class="lead">{% trans username=profile.username %}{{ username }} follows nobody  at this time{% endtrans %}</p>
-=======
-<p class="lead">{% trans username=profile.username %}{{ username }} follows nobody at this time{% endtrans %}</p>
->>>>>>> 28e12a6695789c8465b62ee3c14f027a7fec05a3
+{% else %}
+<p class="lead">{% trans username=profile.username %}{{ username }} follows nobody at this time{% endtrans %}</p>
 {% endif %}
 {% endblock %}