[389-ds-base/el6/master: 5/8] fix merge weirdness

[Richard Allen Megginson]

commit 6abb4ca042683dfeca7c842ea5a4977d743f3702
Author: Rich Megginson <rmeggins at redhat.com>
Date:   Wed Oct 27 17:51:36 2010 -0600

    fix merge weirdness

 389-ds-base.spec |    6 ------
 1 files changed, 0 insertions(+), 6 deletions(-)
---
diff --git a/389-ds-base.spec b/389-ds-base.spec
index 2c25c4e..e9d1717 100644
--- a/389-ds-base.spec
+++ b/389-ds-base.spec
@@ -393,15 +393,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
-=======
-<<<<<<< HEAD:389-ds-base.spec
-=======
 
 * Wed Sep 22 2010 Rich Megginson <rmeggins at 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
->>>>>>> f12:389-ds-base.spec
 
 * Thu Aug 26 2010 Rich Megginson <rmeggins at redhat.com> - 1.2.6-1
 - This is the final 1.2.6 release