git hub add gitignore and gitattributes

This commit is contained in:
fanqq 2015-04-27 15:32:41 +08:00
parent 9e5c493171
commit 09ca7f55f0
2 changed files with 7 additions and 0 deletions

1
.gitattributes vendored Normal file
View file

@ -0,0 +1 @@
.gitignore merge=ours

6
.gitignore vendored
View file

@ -1,3 +1,5 @@
#github .gitignore file
#@can not merge to dev git
/ws/*
/target/*
/bin/*
@ -9,3 +11,7 @@
.idea/
classes/
*.iml
conf/uat/*
conf/fat/*
conf/prod/*
conf/fws/*