From 804f595fc8621db772ade0c767cef643f5a87c8c Mon Sep 17 00:00:00 2001 From: Elie Kuradusenge <68749686+elijahladdie@users.noreply.github.com> Date: Wed, 5 Jun 2024 14:25:15 +0200 Subject: [PATCH] Delete \ --- "\\" | 55 ------------------------------------------------------- 1 file changed, 55 deletions(-) delete mode 100644 "\\" diff --git "a/\\" "b/\\" deleted file mode 100644 index 29702f9..0000000 --- "a/\\" +++ /dev/null @@ -1,55 +0,0 @@ -Merge branch 'develop' of https://github.com/atlp-rwanda/knights-ecomm-be into ft-coverage - -# Conflicts: -# src/routes/index.ts -# -# It looks like you may be committing a merge. -# If this is not correct, please remove the file -# .git/MERGE_HEAD -# and try again. - - -# Please enter the commit message for your changes. Lines starting -# with '#' will be ignored, and an empty message aborts the commit. -# -# On branch ft-coverage -# Your branch is up to date with 'origin/ft-coverage'. -# -# All conflicts fixed but you are still merging. -# -# Changes to be committed: -# modified: package.json -# modified: src/__test__/cart.test.ts -# new file: src/__test__/isValid.test.ts -# new file: src/__test__/login.service.test.ts -# new file: src/__test__/notification.test.ts -# modified: src/__test__/test-assets/DatabaseCleanup.ts -# new file: src/__test__/user,Route.test.ts -# new file: src/__test__/user.profile.update.service.test.ts -# new file: src/controllers/notificationControllers.ts -# modified: src/controllers/orderController.ts -# new file: src/docs/notifications.yml -# modified: src/docs/orderDocs.yml -# new file: src/entities/Notification.ts -# new file: src/entities/NotificationItem.ts -# modified: src/entities/VendorOrderItem.ts -# modified: src/helper/verify.ts -# new file: src/routes/NoficationRoutes.ts -# modified: src/routes/ProductRoutes.ts -# modified: src/routes/index.ts -# modified: src/services/adminOrderServices/updateOrder.ts -# modified: src/services/couponServices/buyerApplyCoupon.ts -# modified: src/services/couponServices/createCouponService.ts -# modified: src/services/feedbackServices/createFeedback.ts -# modified: src/services/index.ts -# new file: src/services/notificationServices/deleteNotification.ts -# new file: src/services/notificationServices/getNotifications.ts -# new file: src/services/notificationServices/updateNotification.ts -# modified: src/services/orderServices/createOrder.ts -# modified: src/services/orderServices/getOrderService.ts -# modified: src/services/orderServices/updateOrderService.ts -# modified: src/services/userServices/userDisableTwoFactorAuth.ts -# modified: src/services/userServices/userEnableTwoFactorAuth.ts -# new file: src/utils/getNotifications.ts -# new file: src/utils/sendNotification.ts -#