Commit 8e1fa399 authored by Huihui, Jonathan's avatar Huihui, Jonathan
Browse files

fix conflict

parent c7432b6a

src/common/env.py

+4 −0
Original line number Diff line number Diff line
@@ -44,11 +44,15 @@ def check_environment(env_var, default=None): 
    return default





<<<<<<< HEAD

def check_multi_environment(env_var, value, env_var_multi, multi_value):

<<<<<<< HEAD

    """ Check if an environment variable has been set using the vanilla

    method, if so, do nothing. If not, check if the modified variable

=======

=======

def check_multi_environment(env_var, env_var_multi, multi_value):

>>>>>>> 7d1001f (fix logic to check if env var exists)

    """ Check if an environment variable exists,

    if so, do nothing. If not, check if the modified variable

>>>>>>> 4361717 (fix logic)