git.samba.org / sahlberg / ctdb.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ba1f6c3)
removed merge fluff
authorAndrew Tridgell <tridge@samba.org>
Tue, 5 May 2009 11:35:52 +0000 (21:35 +1000)
committerAndrew Tridgell <tridge@samba.org>
Tue, 5 May 2009 11:35:52 +0000 (21:35 +1000)
packaging/RPM/ctdb.spec patch | blob | history

diff --git a/packaging/RPM/ctdb.spec b/packaging/RPM/ctdb.spec
index ac4f90875b1aa8a5a3b9c96e0164e8f4faf010f3..6c628c3c72361f7edbac0acf66a608d270d44812 100644 (file)
--- a/packaging/RPM/ctdb.spec
+++ b/packaging/RPM/ctdb.spec
@@ -131,7 +131,6 @@ fi
 %{_libdir}/pkgconfig/ctdb.pc
 
 %changelog
-<<<<<<< HEAD:packaging/RPM/ctdb.spec
 * Tue May 5 2009 : Version 1.0.69-6
  - Try to add back the routes in 99.routing both for the takeip and also the
    releaseip event since during releaseip) too many addresses may have been
CTDB repository