Browse Source

fix conflict

master
Mata.Li 6 years ago
parent
commit
79045dd77e
  1. 4
      .gitignore

4
.gitignore vendored

@ -4,9 +4,5 @@
.classpath .classpath
.project .project
target/ target/
${web-inf-path}/
assets/
lib/
logs/

Loading…
Cancel
Save