Merge pull request #883 from leeseett/main

Remove merge conflict hint code
2025-03-21 13:09:42 +08:00 · 2025-03-21 13:09:42 +08:00 · 35209978e1
commit 35209978e1
parent e218c0655f 3dd990e554
1 changed files with 0 additions and 1 deletions
--- a/config/config.example.toml
+++ b/config/config.example.toml
@ -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