From a6d438367f3c43c4a4f702a39425b9d6d58a73ff Mon Sep 17 00:00:00 2001
From: MewenLeHo <mewen.leho.ext@orange.com>
Date: Tue, 19 Oct 2021 17:11:20 +0200
Subject: [PATCH] fix(#831): fix everything broken after pull

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

diff --git a/package-lock.json b/package-lock.json
index 85e9eb79e2..7c0e8a85c4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,7 @@
 {
   "name": "boosted",
-<<<<<<< Updated upstream
-  "version": "5.1.3",
-  "lockfileVersion": 1,
-=======
   "version": "5.1.2",
   "lockfileVersion": 2,
->>>>>>> Stashed changes
   "requires": true,
   "packages": {
     "": {