From 903b5c03997ba1110800e1f9f89c6e192ac528c5 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Fri, 6 Mar 2026 13:06:45 +0800
Subject: [PATCH] core: reslove git conflict

---
 apps/jumpserver/settings/custom.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/apps/jumpserver/settings/custom.py b/apps/jumpserver/settings/custom.py
index 77101254d..ebb3daaef 100644
--- a/apps/jumpserver/settings/custom.py
+++ b/apps/jumpserver/settings/custom.py
@@ -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