Merge branch 'develop' of https://github.com/exodus4d/pathfinder into develop
Conflicts: node_modules/.gitignore
This commit is contained in:
2
node_modules/.gitignore
generated
vendored
2
node_modules/.gitignore
generated
vendored
@@ -1,4 +1,4 @@
|
||||
#ignore all files in this dir...
|
||||
*
|
||||
#... except for this one.
|
||||
!.gitignore
|
||||
!.gitignore
|
||||
|
||||
Reference in New Issue
Block a user