fix(app): Merge conflict resolve

This commit is contained in:
2024-07-03 16:54:38 +03:00
parent 1b2b7646b6
commit 562935a30f
3 changed files with 3 additions and 4 deletions

2
.gitignore vendored
View File

@@ -7,4 +7,4 @@
/.flutter-plugins-dependencies
/.packages
/.env
/node_modules
/node_modules/

View File

@@ -1,8 +1,7 @@
run-tests:
flutter test
run-analyse:
flutter analyze
run-checks: run-analyse run-tests
run-checks: run-analyse run-tests

View File

@@ -19,4 +19,4 @@
"pre-push": "make run-checks",
"preserveUnused": true
}
}
}