[389-ds-base/f17: 21/21] 6c0778f bumped version to 1.2.11.11

[Mark Reynolds]

commit 021c33eeb5f1292bba8c733cd1e84782293c6d64
Author: Mark Reynolds <mreynolds at redhat.com>
Date:   Mon Aug 20 14:34:09 2012 -0400

    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
    (cherry picked from commit a14ef054f243d2331b6a2d47c23968ae1a5fe0d4)

 389-ds-base.spec |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)
---
diff --git a/389-ds-base.spec b/389-ds-base.spec
index ba92fd5..573c0ba 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/