Revert accidental changes.

lib/experimental/html/class-wp-html-tag-processor.php

@@ -1491,17 +1491,17 @@ public function set_attribute( $name, $value ) {
 		 */
 		if ( preg_match(
 			'~[' .
-				// Syntax-like characters.
-				'"\'>&</ =' .
-				// Control characters.
-				'\x{00}-\x{1F}' .
-				// HTML noncharacters.
-				'\x{FDD0}-\x{FDEF}' .
-				'\x{FFFE}\x{FFFF}\x{1FFFE}\x{1FFFF}\x{2FFFE}\x{2FFFF}\x{3FFFE}\x{3FFFF}' .
-				'\x{4FFFE}\x{4FFFF}\x{5FFFE}\x{5FFFF}\x{6FFFE}\x{6FFFF}\x{7FFFE}\x{7FFFF}' .
-				'\x{8FFFE}\x{8FFFF}\x{9FFFE}\x{9FFFF}\x{AFFFE}\x{AFFFF}\x{BFFFE}\x{BFFFF}' .
-				'\x{CFFFE}\x{CFFFF}\x{DFFFE}\x{DFFFF}\x{EFFFE}\x{EFFFF}\x{FFFFE}\x{FFFFF}' .
-				'\x{10FFFE}\x{10FFFF}' .
+			// Syntax-like characters.
+			'"\'>&</ =' .
+			// Control characters.
+			'\x{00}-\x{1F}' .
+			// HTML noncharacters.
+			'\x{FDD0}-\x{FDEF}' .
+			'\x{FFFE}\x{FFFF}\x{1FFFE}\x{1FFFF}\x{2FFFE}\x{2FFFF}\x{3FFFE}\x{3FFFF}' .
+			'\x{4FFFE}\x{4FFFF}\x{5FFFE}\x{5FFFF}\x{6FFFE}\x{6FFFF}\x{7FFFE}\x{7FFFF}' .
+			'\x{8FFFE}\x{8FFFF}\x{9FFFE}\x{9FFFF}\x{AFFFE}\x{AFFFF}\x{BFFFE}\x{BFFFF}' .
+			'\x{CFFFE}\x{CFFFF}\x{DFFFE}\x{DFFFF}\x{EFFFE}\x{EFFFF}\x{FFFFE}\x{FFFFF}' .
+			'\x{10FFFE}\x{10FFFF}' .
 			']~Ssu',
 			$name
 		) ) {
@@ -1674,17 +1674,6 @@ public function get_updated_html() {
 		$this->updated_bytes = strlen( $this->updated_html );
 
 		// 3. Point this tag processor at the original tag opener and consume it
-<<<<<<< HEAD
-=======
-		$this->parsed_bytes = strlen( $updated_html_up_to_current_tag_name_end ) - $this->tag_name_length - 2;
-
-		// This ensures compatibility with older PHP versions.
-		// strpos() doesn't support negative offset values on PHP prior to version 7.1.
-		//
-		if ( 0 > $this->parsed_bytes ) {
-			$this->parsed_bytes = strlen( $this->updated_html ) - abs( $this->parsed_bytes );
-		}
->>>>>>> 2a8585c8e2 (// strpos() doesn't support negative offset values on PHP prior to version 7.1.)
 
 		/*
 		 * When we get here we're at the end of the tag name, and we want to rewind to before it