right

FitMind-app/package-lock.json

@@ -22,10 +22,7 @@
         "@capacitor/keyboard": "6.0.3",
         "@capacitor/status-bar": "6.0.2",
         "@ionic/angular": "^8.0.0",
-<<<<<<< HEAD
-=======
         "express": "^4.21.2",
->>>>>>> 3370d3efbede247b8ee7e84c513680bc73242964
         "fmode-ng": "^0.0.63",
         "ionicons": "^7.2.1",
         "rxjs": "~7.8.0",

FitMind-app/package.json

@@ -27,10 +27,7 @@
     "@capacitor/keyboard": "6.0.3",
     "@capacitor/status-bar": "6.0.2",
     "@ionic/angular": "^8.0.0",
-<<<<<<< HEAD
-=======
     "express": "^4.21.2",
->>>>>>> 3370d3efbede247b8ee7e84c513680bc73242964
     "fmode-ng": "^0.0.63",
     "ionicons": "^7.2.1",
     "rxjs": "~7.8.0",