删除合并冲突提示代码

2025-03-21 11:49:26 +08:00
parent e218c0655f
commit 3dd990e554
1 changed files with 0 additions and 1 deletions
@@ -90,4 +90,3 @@ temperature = 0.0                           # Controls randomness for vision mod
 #cpu_limit = 2.0
 #timeout = 300
 #network_enabled = true
->>>>>>>>> Temporary merge branch 2