merge git ignore
This commit is contained in:
parent
1cfead2f8c
commit
d2952f0af1
1 changed files with 0 additions and 4 deletions
4
.gitignore
vendored
4
.gitignore
vendored
|
|
@ -1,6 +1,2 @@
|
|||
client/node_modules
|
||||
<<<<<<< HEAD
|
||||
server/node_modules
|
||||
=======
|
||||
server/node_modules
|
||||
>>>>>>> 68eacf2750f54cccc2941c4e9e5e454525c23bd3
|
||||
|
|
|
|||
Loading…
Reference in a new issue