github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-09-01 23:47:40 +00:00
Code Issues Projects Releases Wiki Activity

perf: 合并冲突

Browse Source
This commit is contained in:
ibuler
2022-08-30 10:07:03 +08:00
parent c950508873
commit 951d4e4e0d
24 changed files with 140 additions and 234 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
apps/common/utils/common.py
View File

@@ -383,8 +383,6 @@ def test_ip_connectivity(host, port, timeout=0.5):
else:
connectivity = False
return connectivity
<<<<<<< HEAD
=======
def static_or_direct(logo_path):
@@ -392,4 +390,3 @@ def static_or_direct(logo_path):
return static(logo_path)
else:
return logo_path
>>>>>>> origin