Replication Conflict Test Suite

ugaston

11.56.2008 0e02964d4df506f9337c34f743e3d6c685633aa6

 opends/tests/functional-tests/testcases/replication/replication.xml

@@ -40,7 +40,7 @@
          <iterate  var="_test" 
                    in="['totalupdate','binarycopy','ldifimport',
                         'resynchronization','basic','schema','failover',
                         'encryption','changelog']">
                         'encryption','changelog', 'conflict']">
            <sequence>
              <import machine="STAF_LOCAL_HOSTNAME"
                      file="'%s/testcases/replication/%s/%s.xml' %