From 81e76a57b56a75bb89e0de48b4669954631fc177 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=96=87=E8=96=87=E5=AE=89?= <vivian@192.168.3.101>
Date: Sun, 18 Jan 2026 10:05:02 +0800
Subject: [PATCH] a

---
 trading_system/position_manager.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/trading_system/position_manager.py b/trading_system/position_manager.py
index eeea8b6..084a769 100644
--- a/trading_system/position_manager.py
+++ b/trading_system/position_manager.py
@@ -114,10 +114,7 @@ class PositionManager:
                 logger.warning(f"   3. 总仓位超过限制")
                 logger.warning(f"   4. 无法获取价格数据")
                 logger.warning(f"   5. 保证金不足最小要求（MIN_MARGIN_USDT）")
-<<<<<<< Current (Your changes)
-=======
                 logger.warning(f"   6. 名义价值小于0.2 USDT（避免无意义的小单子）")
->>>>>>> Incoming (Background Agent changes)
                 return None
             
             logger.info(f"✓ {symbol} 仓位计算成功: {quantity:.4f}")