#19 resolve one last merge conflict

OllieJones · OllieJones · commit f983b56a20cb · 2023-03-22T07:57:46.000-04:00
diff --git a/wp-includes/sqlite/class-wp-sqlite-translator.php b/wp-includes/sqlite/class-wp-sqlite-translator.php
@@ -1984,7 +1984,7 @@ private function translate_function_aliases( $token ) {
 	/**
 	 * Translate VALUES() function.
 	 *
-	 * @param WP_SQLite_Token $token The token to translate.
+	 * @param WP_SQLite_Token $token                   The token to translate.
 	 *
 	 * @return bool
 	 */

Original file line number	Diff line number	Diff line change
`@@ -1984,7 +1984,7 @@ private function translate_function_aliases( $token ) {`
`1984`	`1984`	`/**`
`1985`	`1985`	`* Translate VALUES() function.`
`1986`	`1986`	`*`
`1987`		`- * @param WP_SQLite_Token $token The token to translate.`
	`1987`	`+ * @param WP_SQLite_Token $token The token to translate.`
`1988`	`1988`	`*`
`1989`	`1989`	`* @return bool`
`1990`	`1990`	`*/`