chore: merge

woowacourse-teams · Aug 7, 2024 · 12638d7 · 12638d7
1 parent e2f9884
commit 12638d7
Showing 1 changed file with 0 additions and 7 deletions.
diff --git a/frontend/src/index.tsx b/frontend/src/index.tsx
@@ -25,18 +25,11 @@ const baseUrlPattern = new RegExp(`^${process.env.API_BASE_URL?.replace(/[-\/\\^
 Sentry.init({
   dsn: `${process.env.SENTRY_DSN}`,
   enabled: !isDev,
-<<<<<<< HEAD
   environment: 'production',
   tracesSampleRate: 1.0,
   tracePropagationTargets: [baseUrlPattern],
   replaysSessionSampleRate: 0.1,
   replaysOnErrorSampleRate: 1.0,
-=======
-  integrations: [Sentry.browserTracingIntegration()],
-  environment: 'production',
-  tracesSampleRate: 1.0,
-  tracePropagationTargets: [baseUrlPattern],
->>>>>>> 1d75ffbfa0847bc426e716c223f3238bdaf74ba0
 });
 
 const queryClient = new QueryClient({