ignore local merge script

pull/1/head
Friendika 12 years ago
parent 8242fb4bf0
commit 2bc4e24da2
  1. 1
      .gitignore

1
.gitignore vendored

@ -8,4 +8,5 @@ include/jquery-1.4.2.min.js
*.version*
push*
langup
merge
home.html

Loading…
Cancel
Save