ignore local merge script

2011-06-23 16:10:36 -07:00
parent 8242fb4bf0
commit 2bc4e24da2
1 changed files with 1 additions and 0 deletions
@@ -8,4 +8,5 @@ include/jquery-1.4.2.min.js
 *.version*
 push*
 langup
+merge
 home.html