Mirrored_Repos/crafty-4
1
0
Fork 0
mirror of https://gitlab.com/crafty-controller/crafty-4.git synced 2024-08-30 18:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixing merge conflict

Browse Source
This commit is contained in:
Phillip Tarrant 2020-08-31 11:30:41 -04:00
commit 79532ffc6b
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -1,6 +1,8 @@
**/logs **/logs
*.log *.log
*.sqlite *.sqlite
*.sqlite-shm
*.sqlite-wal
__pycache__/ __pycache__/
*.py[cod] *.py[cod]
@ -19,5 +21,6 @@ servers/
session.lock session.lock
.header .header
default.json default.json
.vscode/
app/config/web app/config/web

3
app/classes/web/server_handler.py
View File

@ -46,9 +46,10 @@ class ServerHandler(BaseHandler):
'hosts_data': db_helper.get_latest_hosts_stats(), 'hosts_data': db_helper.get_latest_hosts_stats(),
'menu_servers': defined_servers, 'menu_servers': defined_servers,
'show_contribute': helper.get_setting("show_contribute_link", True) 'show_contribute': helper.get_setting("show_contribute_link", True)
} }
if page == "step1": if page == "step1":
page_data['server_types'] = server_jar_obj.get_serverjar_data() page_data['server_types'] = server_jar_obj.get_serverjar_data()