Permalink
Browse files

You forgot a merge

  • Loading branch information...
gugu committed Aug 31, 2012
1 parent 48e07a9 commit dee8c68bd56173853ed670e682d0fbbc772dbb8f
Showing with 1 addition and 6 deletions.
  1. +1 −6 requirements/default.txt
View
@@ -1,8 +1,3 @@
billiard>=2.7.3.12
-<<<<<<< HEAD
-python-dateutil>=2.1
-kombu>=2.4.4,<3.0
-=======
python-dateutil>=1.5,<2.0
-kombu>=2.4.5,<3.0
->>>>>>> 3.0
+kombu>=2.4.5,<3.0

0 comments on commit dee8c68

Please sign in to comment.