Added testcase for issue OPENDJ-1192

Christophe Sovant

05.44.2013 8318d88bbe9453debdd86bdc7f96a9808c0874a8

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

@@ -152,6 +152,7 @@
                  testsList.append('replication_conflict_016')
                  testsList.append('replication_conflict_017')
                  testsList.append('replication_conflict_018')
                  testsList.append('replication_conflict_019')
                </script>

                <!-- Execute the Tests -->