删除合并冲突提示代码
This commit is contained in:
parent
e218c0655f
commit
3dd990e554
@ -90,4 +90,3 @@ temperature = 0.0 # Controls randomness for vision mod
|
|||||||
#cpu_limit = 2.0
|
#cpu_limit = 2.0
|
||||||
#timeout = 300
|
#timeout = 300
|
||||||
#network_enabled = true
|
#network_enabled = true
|
||||||
>>>>>>>>> Temporary merge branch 2
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user