From a14ef054f243d2331b6a2d47c23968ae1a5fe0d4 Mon Sep 17 00:00:00 2001
From: Mark Reynolds <mreynolds@redhat.com>
Date: Aug 20 2012 18:34:09 +0000
Subject: 6c0778f bumped version to 1.2.11.11


Ticket 429 - added nsslapd-readonly to DS schema
Ticket 403 - fix CLEANALLRUV regression from last commit
Trac Ticket #346 - Slow ldapmodify operation time for large quantities of multi-valued attribute values

---

diff --git a/389-ds-base.spec b/389-ds-base.spec
index b4e0cdf..5f883b6 100644
--- a/389-ds-base.spec
+++ b/389-ds-base.spec
@@ -21,11 +21,7 @@
 
 Summary:          389 Directory Server (base)
 Name:             389-ds-base
-<<<<<<< HEAD
-Version:          1.2.11.10
-=======
 Version:          1.2.11.11
->>>>>>> master
 Release:          %{?relprefix}1%{?prerel}%{?dist}
 License:          GPLv2 with exceptions
 URL:              http://port389.org/