From b41573dc3fd9181e84242e249bbd9ea9e125a2a9 Mon Sep 17 00:00:00 2001
From: TheCoreDev <laurent@thecoredev.fr>
Date: Fri, 1 Dec 2023 14:06:23 +0100
Subject: [PATCH] Update package.json

---
 package.json | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/package.json b/package.json
index 0757425..e61b57a 100644
--- a/package.json
+++ b/package.json
@@ -5,11 +5,7 @@
   "main": "mia_ihm.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
-<<<<<<< HEAD
-    "start": "nodemon app.js"
-=======
     "start": "nodemon mia_ihm.js"
->>>>>>> master
   },
   "author": "Laurent LE CORRE",
   "license": "ISC",