fix merge

Author: afragen

src/wp-admin/includes/update-core.php

@@ -778,12 +778,6 @@
 	'wp-includes/blocks/block/editor.min.css',
 	'wp-includes/blocks/block/editor-rtl.css',
 	'wp-includes/blocks/block/editor-rtl.min.css',
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-	// 6.7
-=======
-=======
->>>>>>> Stashed changes
 	/*
 	 * 6.7
 	 *
@@ -848,10 +842,6 @@
 	'wp-includes/js/dist/fields.min.js',
 	'wp-includes/js/dist/fields.js',
     // 6.9
-<<<<<<< Updated upstream
->>>>>>> Stashed changes
-=======
->>>>>>> Stashed changes
 	'wp-content/plugins/hello.php',
 );