[389-commits] [389-ds-base] 01/02: Issue 50712 - fix cherry-pick error

This is an automated email from the git hooks/post-receive script.

mreynolds pushed a commit to branch 389-ds-base-1.4.1
in repository 389-ds-base.

commit 23b7bbbbc1c0dd6ca86a63b34829064e412b1244
Author: Mark Reynolds <mreynolds(a)redhat.com&gt;
AuthorDate: Wed Nov 13 16:47:31 2019 -0500

    Issue 50712 - fix cherry-pick error
    
    relates: https://pagure.io/389-ds-base/issue/50712
---
 src/lib389/lib389/utils.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/lib389/lib389/utils.py b/src/lib389/lib389/utils.py
index 668501a..a2f16de 100644
--- a/src/lib389/lib389/utils.py
+++ b/src/lib389/lib389/utils.py
@@ -1079,11 +1079,7 @@ def ds_is_related(relation, *ver):
             if cmp_ver.startswith(ds_ver[:3]):
                 return ops[relation](ds_ver,cmp_ver)
     else:
-<<<<<<< HEAD
-        return ops[relation](ds_ver, ver[0])
-=======
         return ops[relation](LegacyVersion(ds_ver), LegacyVersion(ver[0]))
->>>>>>> 2b8750d6b... Issue #50712 - Version comparison doesn't
work correctly on git builds
 
 
 def ds_is_older(*ver):

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.