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

[Mark Reynolds]

commit 4726436ee58abd30cfc19098b52b1905e5ceab51
Author: Mark Reynolds <mreynolds at redhat.com>
Date:   Mon Aug 20 15:49:33 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

 sources |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)
---
diff --git a/sources b/sources
index beee089..4fa0816 100644
--- a/sources
+++ b/sources
@@ -1,5 +1 @@
-<<<<<<< HEAD
-d8ceee738c93f9de746d0a11393bad6b  389-ds-base-1.2.11.10.tar.bz2
-=======
 26c430ed287218c4fa55e336ee5498a7  389-ds-base-1.2.11.11.tar.bz2
->>>>>>> master