Skip to content

GitLab

S
storjstatus-client
Commit 148d3463 authored by James Coyle's avatar James Coyle
Browse files
Options

Fixed merge issue

parent 2629ee40
Pipeline #1241 passed with stages
        in 4 seconds
        Hide whitespace changes
        Inline Side-by-side
        Showing with 0 additions and 4 deletions
        storjstatus/version.py
        View file @ 148d3463
        <<<<<<< HEAD
        __version__ = '0.3.0'
        =======
        __version__ = '0.2.7'
        >>>>>>> c778c9176753976ed977fc2bf64e632f499cdfa3
        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