fix: resolved main conflicts

2025-02-06 13:58:49 -06:00
parent ddc7d5b20a 6c635bd70d
commit 0188d6c065
445 changed files with 17788 additions and 7448 deletions
--- a/e2e/playwright/code-pane-and-errors.spec.ts
+++ b/e2e/playwright/code-pane-and-errors.spec.ts
@ -6,7 +6,7 @@ import { bracket } from 'lib/exampleKcl'
 import { TEST_CODE_LONG_WITH_ERROR_OUT_OF_VIEW } from './storageStates'
 import fsp from 'fs/promises'

-test.describe('Code pane and errors', () => {
+test.describe('Code pane and errors', { tag: ['@skipWin'] }, () => {
  test('Typing KCL errors induces a badge on the code pane button', async ({
    page,
    homePage,