From beabbe7fd66e5851d8e2434d2af43cb27745f75a Mon Sep 17 00:00:00 2001
From: Jadowacu1 <152473876+Jadowacu1@users.noreply.github.com>
Date: Mon, 20 May 2024 15:44:33 +0200
Subject: [PATCH] fixing merge issues

---
 .husky/pre-commit | 1 +
 package.json      | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 .husky/pre-commit

diff --git a/.husky/pre-commit b/.husky/pre-commit
new file mode 100644
index 00000000..3867a0fe
--- /dev/null
+++ b/.husky/pre-commit
@@ -0,0 +1 @@
+npm run lint
diff --git a/package.json b/package.json
index bda2bfe2..c9f5065e 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,8 @@
     "coveralls": "nyc --reporter=lcov --reporter=text-lcov npm test | coveralls",
     "coverage": "nyc mocha --require ts-node/register 'src/**/*.spec.ts' --timeout 300000 --exit",
     "lint": "eslint . --ext .ts",
-    "lint-staged": "lint-staged"
+    "lint-staged": "lint-staged",
+    "prepare": "husky"
   },
   "nyc": {
     "extends": "@istanbuljs/nyc-config-typescript",