diff --git a/package-lock.json b/package-lock.json index 1ab61135..38b1629c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3,16 +3,6 @@ "version": "0.1.0", "lockfileVersion": 2, "requires": true, -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> dbdab3d (fix: 🐛 #2719) -======= ->>>>>>> 2003b8e (fix(2703): fixes on match profile) -======= ->>>>>>> e05eff4 (fix: 🐛 #2736) "packages": { "": { "name": "spa_instat_tv", @@ -33691,19 +33681,6 @@ } } }, -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> 84d3cdc (fix(#2701): fix styled for tournament modal close button) -======= ->>>>>>> dbdab3d (fix: 🐛 #2719) -======= -======= ->>>>>>> 2304396 (fix(2703): fixes on match profile) ->>>>>>> 2003b8e (fix(2703): fixes on match profile) -======= ->>>>>>> e05eff4 (fix: 🐛 #2736) "dependencies": { "@babel/code-frame": { "version": "7.16.0",