merge

withastro · Oct 11, 2024 · 65b491c · 65b491c
1 parent 41892a4
commit 65b491c
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/packages/astro/e2e/fixtures/view-transitions/public/video.mp4 b/packages/astro/e2e/fixtures/view-transitions/public/video.mp4
diff --git a/packages/astro/e2e/fixtures/view-transitions/src/components/Video.astro b/packages/astro/e2e/fixtures/view-transitions/src/components/Video.astro
@@ -1,11 +1,6 @@
-<<<<<<< HEAD
-<video controls="" name="media" transition:persist transition:name="video" autoplay>
-	<source src="/video.mp4" type="video/mp4">
-=======
 ---
 import vidUrl from '../assets/astro-build.mp4';
 ---
-<video controls="" autoplay="" transition:persist transition:name="video" autoplay>
+<video controls="" transition:persist transition:name="video" autoplay>
 	<source src={vidUrl} type="video/mp4">
->>>>>>> main
 </video>