Remove branch message

acmucsd · Sep 28, 2024 · e9eb8d8 · e9eb8d8
1 parent 9fe76c9
commit e9eb8d8
Showing 1 changed file with 0 additions and 1 deletion.
diff --git 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);