[389-ds-base/f17] 9a7ba7d bump verison to 1.2.11.21

[Mark Reynolds]

commit 3e72dbd7092f2a10145ebf0ead0b56b35d875399
Author: Mark Reynolds <mreynolds at redhat.com>
Date:   Tue Apr 9 15:43:37 2013 -0400

    9a7ba7d bump verison to 1.2.11.21
    
    Ticket 47318 - server fails to start after upgrade(schema error)

 sources |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)
---
diff --git a/sources b/sources
index 97c2f15..46e65a7 100644
--- a/sources
+++ b/sources
@@ -1,5 +1 @@
-<<<<<<< HEAD
 1b577e7ab20ff94c2b63f43d5b651208  389-ds-base-1.2.11.21.tar.bz2
-=======
-ee5e57fa0e28a2d4ec67fa5b1162c306  389-ds-base-1.2.11.20.tar.bz2
->>>>>>> d19c9a38e234998adb6a7823e49ab9fe75f7650e