dépôts
/
lhc
/
web
/
wiklou.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6a916e7
)
fix conflict marker in comment
author
daniel
<daniel.kinzler@wikimedia.de>
Mon, 12 Nov 2012 13:37:32 +0000
(14:37 +0100)
committer
daniel
<daniel.kinzler@wikimedia.de>
Mon, 12 Nov 2012 13:37:32 +0000
(14:37 +0100)
Change-Id: I23e9593890ab5899e10d8eb61f63f38fb98072a7
includes/Revision.php
patch
|
blob
|
history
diff --git
a/includes/Revision.php
b/includes/Revision.php
index
fd356e1
..
5d6bcbd
100644
(file)
--- a/
includes/Revision.php
+++ b/
includes/Revision.php
@@
-1404,11
+1404,7
@@
class Revision implements IDBAccessObject {
* Lazy-load the revision's text.
* Currently hardcoded to the 'text' table storage engine.
*
-<<<<<<< HEAD
- * @return String|boolean the revision text, or false on failure
-=======
* @return String|bool the revision's text, or false on failure
->>>>>>> (Bug 41244) Gracefully handle failure to load text blob.
*/
protected function loadText() {
wfProfileIn( __METHOD__ );