fanruan
/
design
6
1
Fork 2
Code Issues 2 Pull Requests Releases Wiki Activity
Browse Source

fix conflict

master
Mata.Li 6 years ago
parent
4892537c19
commit
79045dd77e
1 changed files with 0 additions and 4 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      .gitignore

4
.gitignore vendored
Unescape View File

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

Write Preview
Loading…
Cancel
Save