forked from eatvio/eatvio_app
fix(app): Merge conflict resolve
This commit is contained in:
2
.gitignore
vendored
2
.gitignore
vendored
@@ -7,4 +7,4 @@
|
||||
/.flutter-plugins-dependencies
|
||||
/.packages
|
||||
/.env
|
||||
/node_modules
|
||||
/node_modules/
|
||||
|
||||
3
Makefile
3
Makefile
@@ -1,8 +1,7 @@
|
||||
|
||||
run-tests:
|
||||
flutter test
|
||||
|
||||
run-analyse:
|
||||
flutter analyze
|
||||
|
||||
run-checks: run-analyse run-tests
|
||||
run-checks: run-analyse run-tests
|
||||
@@ -19,4 +19,4 @@
|
||||
"pre-push": "make run-checks",
|
||||
"preserveUnused": true
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user