Fix wrong merge

ckan · Jun 23, 2016 · 15ed4fc · 15ed4fc
1 parent 70da7e0
commit 15ed4fc
Showing 1 changed file with 0 additions and 1 deletion.
diff --git 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