From 562935a30f585bff44e5a937f17e1e2e9b06385b Mon Sep 17 00:00:00 2001
From: maxxkim <maxxkim@ya.ru>
Date: Wed, 3 Jul 2024 16:54:38 +0300
Subject: [PATCH] fix(app): Merge conflict resolve

---
 .gitignore   | 2 +-
 Makefile     | 3 +--
 package.json | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0a428509..9d9b1cef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,4 +7,4 @@
 /.flutter-plugins-dependencies
 /.packages
 /.env
-/node_modules
\ No newline at end of file
+/node_modules/
diff --git a/Makefile b/Makefile
index 3b10f126..cd6bc421 100644
--- a/Makefile
+++ b/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
\ No newline at end of file
diff --git a/package.json b/package.json
index 8c0eba5b..9b39c56a 100644
--- a/package.json
+++ b/package.json
@@ -19,4 +19,4 @@
     "pre-push": "make run-checks",
     "preserveUnused": true
   }
-}
+}
\ No newline at end of file