From 15ed4fc30b597d2284c5de51df2f6e68598fdcb1 Mon Sep 17 00:00:00 2001
From: amercader <amercadero@gmail.com>
Date: Thu, 23 Jun 2016 13:39:32 +0100
Subject: [PATCH] Fix wrong merge

---
 requirements.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 2e7f5d9efda..eb0cc012f1f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -38,7 +38,6 @@ pytz==2016.4
 pyutilib.component.core==4.6.4
 repoze.lru==0.6           # via routes
 repoze.who-friendlyform==1.0.8
-<<<<<<< HEAD
 repoze.who==2.3
 requests==2.10.0
 Routes==1.13              # via pylons