@@ -73,12 +73,9 @@
"mongoose": "^7.0.4",
"mysql2": "^3.1.2",
"nestjs-typeorm-paginate": "^4.0.3",
-<<<<<<< HEAD
"node-cron": "^3.0.2",
"node-schedule": "^2.1.1",
-=======
"node-xlsx": "^0.23.0",
->>>>>>> 9c70b579dd00d79c345cb91552da11e0ea667f25
"nodemailer": "^6.9.1",
"p-timeout": "^6.1.1",
"passport": "^0.6.0",
