From 2ed38caf0f764b5227c4aaf0b3c229c634f656d5 Mon Sep 17 00:00:00 2001
From: Rich Megginson <rmeggins@redhat.com>
Date: Oct 27 2010 23:40:39 +0000
Subject: fix git merge problems


---

diff --git a/389-ds-base.spec b/389-ds-base.spec
index d6a3adc..8745cd3 100644
--- a/389-ds-base.spec
+++ b/389-ds-base.spec
@@ -14,7 +14,7 @@
 Summary:          389 Directory Server (base)
 Name:             389-ds-base
 Version:          1.2.7
-Release:          %{?relprefix}4%{?prerel}%{?dist}
+Release:          %{?relprefix}5%{?prerel}%{?dist}
 License:          GPLv2 with exceptions
 URL:              http://port389.org/
 Group:            System Environment/Daemons
@@ -398,12 +398,9 @@ end
 - Bug 612264 - ACI issue with (targetattr='userPassword')
 - Bug 606920 - anonymous resource limit- nstimelimit - also applied to "cn=directory manager"
 - Bug 631862 - crash - delete entries not in cache + referint
-<<<<<<< HEAD:389-ds-base.spec
-=======
 
 * Wed Sep 22 2010 Rich Megginson <rmeggins@redhat.com> - 1.2.6-2
 - put back some of the selinux requires that I nuked during a git merge :P
->>>>>>> f13:389-ds-base.spec
 
 * Thu Aug 26 2010 Rich Megginson <rmeggins@redhat.com> - 1.2.6-1
 - This is the final 1.2.6 release