fix unresolved merge conflict

bigcommerce · Oct 24, 2024 · 3de1ed0 · 3de1ed0
1 parent 73af153
commit 3de1ed0
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/core/app/[locale]/(default)/cart/_actions/redirect-to-checkout.ts b/core/app/[locale]/(default)/cart/_actions/redirect-to-checkout.ts
@@ -1,11 +1,7 @@
 'use server';
 
-<<<<<<< HEAD
 import { getLocale } from 'next-intl/server';
 import { z } from 'zod';
-=======
-import { cookies } from 'next/headers';
->>>>>>> b4c40a5a (refactor(core): cart (#1400))
 
 import { getSessionCustomerId } from '~/auth';
 import { client } from '~/client';