chore: remove-labeler-action

ryanbas21 · ryanbas21 · commit eb4d9e75d636 · 2024-12-16T15:53:53.000-07:00
diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml
diff --git a/.prettierignore b/.prettierignore
@@ -5,4 +5,8 @@
 package-lock.json
 */*/package-lock.json
 .husky/*
-/.nx/workspace-data
+/.nx/workspace-data
+pnpm-lock.yml
+packages/*/dist
+e2e/*/dist
+*/dist
diff --git a/e2e/davinci-suites/playwright.config.ts b/e2e/davinci-suites/playwright.config.ts
@@ -5,12 +5,8 @@ import { workspaceRoot } from '@nx/devkit';
 const baseURL = process.env['BASE_URL'] || 'http://localhost:5829';
 
 const config: PlaywrightTestConfig = {
-<<<<<<< HEAD
-  ...baseConfig,
   outputDir: './.playwright',
-=======
   testDir: './src',
->>>>>>> c9c7c19 (chore: remove-ping-protect-and-e2es)
   reporter: process.env.CI ? 'github' : 'list',
   timeout: 30000,
   use: {
