Merge pull request 'fix(app): Merge conflict resolve' (#41) from diary_refactor into main

Reviewed-on: maxxkim/eatvio_app#41
2024-07-03 13:54:56 +00:00
parent 5dfce4b173 562935a30f
commit b4180f7bc9
3 changed files with 3 additions and 4 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -7,4 +7,4 @@
 /.flutter-plugins-dependencies
 /.packages
 /.env
-/node_modules
+/node_modules/
--- a/3
+++ b/3
@@ -1,8 +1,7 @@
-
 run-tests:
 	flutter test

 run-analyse:
 	flutter analyze

-run-checks: run-analyse run-tests
+run-checks: run-analyse run-tests
--- a/package.json
+++ b/package.json
@@ -19,4 +19,4 @@
    "pre-push": "make run-checks",
    "preserveUnused": true
  }
-}
+}