From e9eb8d82f5149c3dfa4156d1a202da16fb62a2ce Mon Sep 17 00:00:00 2001
From: Max Weng <maxwn04@gmail.com>
Date: Sat, 28 Sep 2024 11:03:15 -0700
Subject: [PATCH] Remove branch message

---
 services/MerchStoreService.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/services/MerchStoreService.ts b/services/MerchStoreService.ts
index 629ac187..28c6f4b5 100644
--- a/services/MerchStoreService.ts
+++ b/services/MerchStoreService.ts
@@ -467,7 +467,6 @@ export default class MerchStoreService {
     });
   }
 
->>>>>>> master
   public async getCartItems(options: string[]): Promise<MerchandiseItemOptionModel[]> {
     return this.transactions.readOnly(async (txn) => {
       const merchItemOptionRepository = Repositories.merchStoreItemOption(txn);