Resolving conflicts in README.md and .gitignore

This commit is contained in:
prabathabey 2015-01-20 14:07:50 +05:30
commit 715d242b22
2 changed files with 1 additions and 2 deletions

1
.gitignore vendored
View File

@ -20,4 +20,3 @@ target
*.war *.war
*.ear *.ear