resolving merge conflict in sgejob.py
resolving merge conflict in sgejob.py

telamonian/saga-python,mehdisadeghi/saga-python,telamonian/saga-python,luis-rr/saga-python,luis-rr/saga-python,luis-rr/saga-python,mehdisadeghi/saga-python