fix merge conflict

getsentry · Apr 26, 2024 · 1701a8f · 1701a8f
1 parent d4c94d2
commit 1701a8f
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/packages/rrweb-snapshot/test/css.test.ts b/packages/rrweb-snapshot/test/css.test.ts
@@ -192,7 +192,6 @@ li[attr="has,comma"] a:hover {
     ).toEqual(1);
   });
 
-<<<<<<< HEAD
   it.each([
     ['.foo,.bar {}', ['.foo', '.bar']],
     ['.bar:has(:disabled) {}', ['.bar:has(:disabled)']],
@@ -272,8 +271,6 @@ li[attr="has,comma"] a:hover {
     },
   );
 
-=======
->>>>>>> develop
   it('parses imports with quotes correctly', () => {
     const out1 = escapeImportStatement({
       cssText: `@import url("/foo.css;900;800"");`,