dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge "rdbms: add and enforce DB_REPLICA/DB_MASTER roles in DBConnRef"
[lhc/web/wiklou.git]
/
includes
/
editpage
/
TextConflictHelper.php
diff --git
a/includes/editpage/TextConflictHelper.php
b/includes/editpage/TextConflictHelper.php
index
f7d0945
..
2471b52
100644
(file)
--- 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();