From 69a0a07dc83ce715ec828e79e270c47231103eec Mon Sep 17 00:00:00 2001
From: Rob Church <robchurch@users.mediawiki.org>
Date: Wed, 17 May 2006 21:07:04 +0000
Subject: [PATCH] There was no cockup. It was all a figment of Brion's
 imagination.

---
 RELEASE-NOTES | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index dc92491f36..460711c24d 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -292,9 +292,6 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 4873) Don't overwrite the subtitle navigation when viewing a redirect page
   that isn't current
 * Enforce the standard upper limit when accessing page histories
-=======
-
->>>>>>> .theirs
 
 == Compatibility ==
 
-- 
2.20.1