Skip to content

GitLab

Commit dc4d546c authored by James Coyle's avatar James Coyle
Browse files
Options

Removed merge tags

parent 84bbc65c
Pipeline #1244 passed with stages
        in 4 seconds
        Hide whitespace changes
        Inline Side-by-side
        Showing with 1 addition and 4 deletions
        storjstatus/storjstatus_send.py
        View file @ dc4d546c
        ......@@ -170,7 +170,6 @@ def config_json():
        def load_settings():
        <<<<<<< HEAD
        if storjstatus_common.get_os_type() == "win":
        return load_settings_win()
        elif storjstatus_common.get_os_type() == "linux":
        ......@@ -192,8 +191,6 @@ def load_settings_win():
        def load_settings_linux():
        =======
        >>>>>>> c778c9176753976ed977fc2bf64e632f499cdfa3
        global APIKEY
        global APISECRET
        global SERVERGUID
        ......
        storjstatus/version.py
        View file @ dc4d546c
        __version__ = '0.3.0'
        __version__ = '0.3.1'
        Markdown is supported
        0% or .
        You are about to add 0 people to the discussion. Proceed with caution.
        Finish editing this message first!
        Please register or to comment