trivial: fix cruft from merge

kay-kim · kay-kim · commit d42f2dd8a022 · 2018-06-11T21:48:52.000-04:00
diff --git a/source/release-notes/4.0.txt b/source/release-notes/4.0.txt
@@ -546,8 +546,6 @@ Miscellaneous
   created outside of a session, you cannot call :dbcommand:`getMore`
   inside a session.
 
-=======
->>>>>>> 8ef55794b... DOCS-11642: listCollection and IS lock
 Changes Affecting Compatibility
 -------------------------------
 
