From: daniel <daniel.kinzler@wikimedia.de>
Date: Mon, 12 Nov 2012 13:37:32 +0000 (+0100)
Subject: fix conflict marker in comment
X-Git-Tag: 1.31.0-rc.0~21657
X-Git-Url: http://git.cyclocoop.org/%22.%24h.%22?a=commitdiff_plain;h=d4d929b352ed4f0c6d8d1febe69f9aca9253209d;p=lhc%2Fweb%2Fwiklou.git

fix conflict marker in comment

Change-Id: I23e9593890ab5899e10d8eb61f63f38fb98072a7
---

diff --git a/includes/Revision.php b/includes/Revision.php
index fd356e12c8..5d6bcbdd6b 100644
--- 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__ );