ignore冲突

f213e677 · liang ce · 7c3c3f2c · e67407fd · f213e677
Commit f213e677 authored Dec 06, 2019 by liang ce
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

.gitignore .gitignore +4 -0

No files found.
--- a/.gitignore
+++ b/.gitignore
 .DS_Store
 node_modules
 dist
+<<<<<<< HEAD
+=======
+
+>>>>>>> e67407fd09b464e3fc896fb4da27c8ac8ea86313
 # local env files
 .env.local
 .env.*.local