github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2026-03-18 11:02:09 +00:00
Code Issues Projects Releases Wiki Activity

core: reslove git conflict

Browse Source
This commit is contained in:
ibuler
2026-03-06 13:06:45 +08:00
parent 0f8ef23860
commit 903b5c0399
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/jumpserver/settings/custom.py
View File

@@ -1,11 +1,7 @@
# -*- coding: utf-8 -*-
#
from pathlib import Path
<<<<<<< HEAD
=======
import os
from urllib.parse import quote
>>>>>>> 0319ee5d5 (feat: support jdmc proxy)
from .base import TEMPLATES, STATIC_DIR
from ..const import CONFIG