Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
James Coyle
storjstatus-client
Commits
dc4d546c
Commit
dc4d546c
authored
Mar 28, 2018
by
James Coyle
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removed merge tags
parent
84bbc65c
Pipeline
#1244
passed with stages
in 4 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
4 deletions
+1
-4
storjstatus/storjstatus_send.py
storjstatus/storjstatus_send.py
+0
-3
storjstatus/version.py
storjstatus/version.py
+1
-1
No files found.
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
'
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment