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 "Add SearchResultTrait"
[lhc/web/wiklou.git]
/
includes
/
editpage
/
TextConflictHelper.php
diff --git
a/includes/editpage/TextConflictHelper.php
b/includes/editpage/TextConflictHelper.php
index
2471b52
..
b5b74fb
100644
(file)
--- a/
includes/editpage/TextConflictHelper.php
+++ b/
includes/editpage/TextConflictHelper.php
@@
-245,7
+245,7
@@
class TextConflictHelper {
* @param string $text
* @return Content
*/
- p
ublic
function toEditContent( $text ) {
+ p
rivate
function toEditContent( $text ) {
return ContentHandler::makeContent(
$text,
$this->title,