X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Feditpage%2FTextConflictHelper.php;h=2471b526a0223d18e6120fdffadbbc3c73ab949c;hb=b5e255e914f0fe70890f8ac61d9d19476699873e;hp=f7d0945ec457728155aa0a8a7ff44485d55f0895;hpb=0770f85a0a293e6c7af6f1d3d3a1dbd2d13c1e09;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/editpage/TextConflictHelper.php b/includes/editpage/TextConflictHelper.php
index f7d0945ec4..2471b526a0 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();