12 年之前 · e842501bec
--- a/requirements/default.txt
+++ b/requirements/default.txt
@@ -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