fix: 解决冲突

Author: ZXXX1999

MY_Focus/src/MY_Focus.lua

@@ -883,15 +883,7 @@ function D.GetDisplayList()
 						end
 						if bRuleFocus then
 							--2025.8.16增加隐藏焦点方法，上述规则满足后，判断最大距离是否为-1，若为-1不显示焦点并跳出规则遍历
-<<<<<<< HEAD
-<<<<<<< HEAD
 							bFocus = via.tRule.nMaxDistance ~= -1
-=======
-							if via.tRule.nMaxDistance == -1 then bFocus = false else bFocus = true end
->>>>>>> 4a64400cb (fix: 鐒︾偣鍒楄〃澧炲姞闅愯棌鐒︾偣鏂规硶锛屽綋婊¤冻瑙勫垯锛堣閲忕櫨鍒嗘瘮銆佺洰鏍囧叧绯伙級鏃讹紝鍒ゆ柇鏈�澶ц窛绂伙紙nMaxDistance锛夋槸鍚︿负-1锛岃嫢涓�-1鍒欎笉鏄剧ず鐒︾偣骞惰烦鍑哄悗缁鍒欓亶鍘嗐��)
-=======
-							bFocus = via.tRule.nMaxDistance ~= -1
->>>>>>> f9d8fff9a (fix: 鎸夋彁绀轰紭鍖栦唬鐮�)
 							tRule = via.tRule
 							szVia = via.szVia
 							bDeletable = via.bDeletable