fix conflict

    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)

    has been specified and return that value instead.

    :param env_var: the vanilla environment variable to look for

    :param env_var_multi: the modified environment variable to look for

    :param multi_value: the value of the modified environmental

    """

<<<<<<< HEAD

<<<<<<< HEAD

    return True

=======

=======

    # assume check environment has already been run on the init

    # and that this process can access that variable??

    # exists - just return value - we don't need to set

    return os.environ[env_var]

<<<<<<< HEAD

>>>>>>> a9803b5 (fix to if default is not none)

    return True

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

=======

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