il y a 7 ans · c421300d31
--- a/script/merge
+++ b/script/merge
@@ -1,8 +0,0 @@
 
				-#!/bin/sh
			
 
				-
			
 
				-echo "Merging to Production Branch.."
			
 
				-
			
 
				-git checkout master
			
 
				-git merge master
			
 
				-git checkout production
			
 
				-git merge production