ignore local merge script

2011-06-23 16:10:36 -07:00 · 2011-06-23 16:10:36 -07:00 · 2bc4e24da2
commit 2bc4e24da2
--- a/.gitignore
+++ b/.gitignore
@ -8,4 +8,5 @@ include/jquery-1.4.2.min.js
 *.version*
 push*
 langup
+merge
 home.html