Compare commits
No commits in common. "master" and "dev" have entirely different histories.
3
.gitignore
vendored
3
.gitignore
vendored
@ -14,10 +14,7 @@
|
|||||||
/build
|
/build
|
||||||
*/build
|
*/build
|
||||||
/src/authtoken.json
|
/src/authtoken.json
|
||||||
<<<<<<< HEAD
|
|
||||||
=======
|
|
||||||
|
|
||||||
>>>>>>> dev
|
|
||||||
# misc
|
# misc
|
||||||
.DS_Store
|
.DS_Store
|
||||||
.env.local
|
.env.local
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user