cleanup for merge

emory-libraries · Feb 12, 2016 · 172e1c1 · 172e1c1
1 parent 2d8713a
commit 172e1c1
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/pip-install-req.txt b/pip-install-req.txt
@@ -2,12 +2,11 @@ django>=1.8,<1.9c
 https://wilson.library.emory.edu/jenkins/job/eullocal-0.17.x/lastSuccessfulBuild/artifact/eullocal/dist/eullocal-0.17.0-pre.tar.gz
 eulcommon
 django-sequences
-<<<<<<< HEAD
+
 django-mptt
 django-linkcheck>=1.2
-=======
 django_admin_bootstrapped
 django-auth-ldap
 django-downtime>=1.0.4
 -e git://github.com/emory-libraries/[email protected]#egg=eultheme
->>>>>>> feature/django-upgrade
+