@@ -30,11 +30,6 @@
"express": "^4.21.2",
"fmode-ng": "^0.0.63",
"ionicons": "^7.2.1",
-<<<<<<< HEAD
- "ng-zorro-antd": "^18.0.0",
- "parse-server": "^7.3.0",
-=======
->>>>>>> 07c5a8a2b928b58acd83c794ac0f536a4f92bd0f
"rxjs": "~7.8.0",
"tslib": "^2.3.0",
"zone.js": "~0.14.2"
