1 年之前 · c0f4489c68
--- a/deploy/test.sh
+++ b/deploy/test.sh
@@ -57,9 +57,5 @@ deploy () {
 
				     restart $1;
			
 
				 }
			
 
				 
			
 
				-<<<<<<< HEAD
			
 
				-deploy 'organization'
			
 
				-deploy 'datacenter'
			
 
				-=======
			
 
				 deploy $1
			
 
				->>>>>>> 6c5c5e4a86262f6791474e42ca8664f4418fc675
			
 
				+