solve conflict
This commit is contained in:
commit
4c3124f24e
4
.gitattributes
vendored
4
.gitattributes
vendored
@ -33,6 +33,7 @@ saved_model/**/* filter=lfs diff=lfs merge=lfs -text
|
|||||||
*.zip filter=lfs diff=lfs merge=lfs -text
|
*.zip filter=lfs diff=lfs merge=lfs -text
|
||||||
*.zst filter=lfs diff=lfs merge=lfs -text
|
*.zst filter=lfs diff=lfs merge=lfs -text
|
||||||
*tfevents* filter=lfs diff=lfs merge=lfs -text
|
*tfevents* filter=lfs diff=lfs merge=lfs -text
|
||||||
|
<<<<<<< HEAD
|
||||||
*.gguf filter=lfs diff=lfs merge=lfs -text
|
*.gguf filter=lfs diff=lfs merge=lfs -text
|
||||||
qwen2.5-72b-instruct-fp16-00001-of-00042.gguf filter=lfs diff=lfs merge=lfs -text
|
qwen2.5-72b-instruct-fp16-00001-of-00042.gguf filter=lfs diff=lfs merge=lfs -text
|
||||||
qwen2.5-72b-instruct-fp16-00002-of-00042.gguf filter=lfs diff=lfs merge=lfs -text
|
qwen2.5-72b-instruct-fp16-00002-of-00042.gguf filter=lfs diff=lfs merge=lfs -text
|
||||||
@ -76,3 +77,6 @@ qwen2.5-72b-instruct-fp16-00039-of-00042.gguf filter=lfs diff=lfs merge=lfs -tex
|
|||||||
qwen2.5-72b-instruct-fp16-00040-of-00042.gguf filter=lfs diff=lfs merge=lfs -text
|
qwen2.5-72b-instruct-fp16-00040-of-00042.gguf filter=lfs diff=lfs merge=lfs -text
|
||||||
qwen2.5-72b-instruct-fp16-00041-of-00042.gguf filter=lfs diff=lfs merge=lfs -text
|
qwen2.5-72b-instruct-fp16-00041-of-00042.gguf filter=lfs diff=lfs merge=lfs -text
|
||||||
qwen2.5-72b-instruct-fp16-00042-of-00042.gguf filter=lfs diff=lfs merge=lfs -text
|
qwen2.5-72b-instruct-fp16-00042-of-00042.gguf filter=lfs diff=lfs merge=lfs -text
|
||||||
|
=======
|
||||||
|
*.EncryptBy4pd filter=lfs diff=lfs merge=lfs -text
|
||||||
|
>>>>>>> ac1cb8c5e1117f8a639e11f028173fcf46eb731e
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user