From 139bffd50cd9bfd473a68718531ace4a6c572a1c Mon Sep 17 00:00:00 2001
From: Jannis Leidel <jannis@leidel.info>
Date: Thu, 24 May 2012 18:03:48 +0200
Subject: [PATCH] Removed leftover from merge conflict.

---
 djangopypi/templates/djangopypi/release_manage_files.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/djangopypi/templates/djangopypi/release_manage_files.html b/djangopypi/templates/djangopypi/release_manage_files.html
index 0b77011..9c7de98 100644
--- a/djangopypi/templates/djangopypi/release_manage_files.html
+++ b/djangopypi/templates/djangopypi/release_manage_files.html
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 {% extends 'djangopypi/base.html' %}
 {% block title %}Manage {{ release }} Files{% endblock %}
 {% block content %}