There was no cockup. It was all a figment of Brion's imagination.

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index dc92491..460711c 100644 (file)
--- 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 ==