From e185f7c61e9737c7a995cc0efc5a7729e275d2ed Mon Sep 17 00:00:00 2001
From: Mark Reynolds <mreynolds@redhat.com>
Date: Sep 03 2019 17:43:40 +0000
Subject: Issue 50538 - Fix cherry-pick error


Description:  Remove cherry-=pick error formating

relates: https://pagure.io/389-ds-base/issue/50538

---

diff --git a/dirsrvtests/tests/suites/replication/cleanallruv_test.py b/dirsrvtests/tests/suites/replication/cleanallruv_test.py
index 43801dd..caf214b 100644
--- a/dirsrvtests/tests/suites/replication/cleanallruv_test.py
+++ b/dirsrvtests/tests/suites/replication/cleanallruv_test.py
@@ -899,7 +899,6 @@ def test_max_tasks(topology_m4):
 
     # Check the errors log for our error message in master 1
     assert m1.searchErrorsLog('Exceeded maximum number of active CLEANALLRUV tasks')
->>>>>>> ab24aa4cb... Issue 50538 - cleanAllRUV task limit is not enforced for replicated tasks
 
 
 if __name__ == '__main__':