fixed a merge that went bad

fd841524 · Mark L. Chang · d1c676d0 · fd841524
Commit fd841524 authored Aug 22, 2012 by Mark L. Chang
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

requirements.txt
+0 -4

No files found.
--- a/requirements.txt
+++ b/requirements.txt
@@ -47,8 +47,4 @@ django-mptt>=0.5.3
 sorl-thumbnail
 networkx
 -r repo-requirements.txt
-<<<<<<< HEAD
 -r test-acceptance-requirements.txt
-=======
-r test-acceptance-requirements.txt
->>>>>>> 693875fd96a3e4686380117fa472d76e561e10f4