fix merge

This commit is contained in:
cnrad
2022-05-24 14:04:47 -04:00
3 changed files with 6 additions and 5 deletions

4
.gitignore vendored
View File

@@ -1,5 +1,9 @@
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
<<<<<<< HEAD
.env
=======
.env
>>>>>>> 849b92cd803993724dce307821dd54ef20d0bee2
# dependencies
/node_modules