X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Feditpage%2FTextConflictHelper.php;h=b5b74fbbaf533a6ffb5cb2a16b41b611392bdcb3;hb=748c5eae2fd5d897c94c48771161c259941a7488;hp=f7d0945ec457728155aa0a8a7ff44485d55f0895;hpb=33afb7440a03df8d1878c94d2f3d3b9fdd1a848b;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/editpage/TextConflictHelper.php b/includes/editpage/TextConflictHelper.php
index f7d0945ec4..b5b74fbbaf 100644
--- a/includes/editpage/TextConflictHelper.php
+++ b/includes/editpage/TextConflictHelper.php
@@ -166,7 +166,6 @@ class TextConflictHelper {
 	 * HTML to build the textbox1 on edit conflicts
 	 *
 	 * @param array $customAttribs
-	 * @return string HTML
 	 */
 	public function getEditConflictMainTextBox( array $customAttribs = [] ) {
 		$builder = new TextboxBuilder();
@@ -246,7 +245,7 @@ class TextConflictHelper {
 	 * @param string $text
 	 * @return Content
 	 */
-	public function toEditContent( $text ) {
+	private function toEditContent( $text ) {
 		return ContentHandler::makeContent(
 			$text,
 			$this->title,