Commit 73f6a73a authored by Huihui, Jonathan's avatar Huihui, Jonathan
Browse files

fix conflict

parent 0c9e170d

src/common/env.py

+6 −0
Original line number Diff line number Diff line
@@ -53,4 +53,10 @@ def check_multi_environment(env_var, value, env_var_multi, multi_value): 
    :param env_var_multi: the modified environment variable to look for

    :param multi_value: the value of the modified environmental

    """

<<<<<<< HEAD

    return True

=======

    



    return True

>>>>>>> 07f2a66 (add env var if default is returned)