ignore local merge script
This commit is contained in:
parent
8242fb4bf0
commit
2bc4e24da2
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -8,4 +8,5 @@ include/jquery-1.4.2.min.js
|
||||||
*.version*
|
*.version*
|
||||||
push*
|
push*
|
||||||
langup
|
langup
|
||||||
|
merge
|
||||||
home.html
|
home.html
|
||||||
|
|
Loading…
Reference in a new issue