fixing release notes

diff --git a/RELEASE b/RELEASE
index 88a10c663e86b29584f2588fd24d946a538a3fc6..bb87dea43aa01c4e26fee2961fbfb8f459387b43 100644 (file)
--- a/RELEASE
+++ b/RELEASE
@@ -1,13 +1,4 @@
-<<<<<<< HEAD
 RELEASE 2.0.0
-=======
-#+OPTIONS: ^:{}
-* Slony-I Release Notes
-** 2.1.5
-- Bug 315 :: Fixes to the compile time include directories
-
-** 2.1.4 
->>>>>>> 99d855d... Only include the libpq header directory OR the server header directory but not both
 
 The first release of version 2.0. See RELEASE-2.0 to see changes leading
 from version 1.2 to 2.0.