Merge remote-tracking branch 'origin/master'

FengChueng · May 22, 2014 · 9542a40 · 9542a40
2 parents 4ca6d22 + 5aa1bea
commit 9542a40
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,10 +3,8 @@ target/
 
 # Package Files #
 *.jar
-*.war
-*.ear
 
 # IDE #
 .idea
 *.iml
-.settings
+.settings