drakosfire commited on
Commit
65f0e7d
1 Parent(s): 1c4103e

Resolved merge conflicts by choosing remote versions and ensured LFS tracking

Browse files
Files changed (1) hide show
  1. .gitattributes +1 -3
.gitattributes CHANGED
@@ -1,4 +1,3 @@
1
- <<<<<<< HEAD
2
  *.7z filter=lfs diff=lfs merge=lfs -text
3
  *.arrow filter=lfs diff=lfs merge=lfs -text
4
  *.bin filter=lfs diff=lfs merge=lfs -text
@@ -34,7 +33,6 @@ saved_model/**/* filter=lfs diff=lfs merge=lfs -text
34
  *.zip filter=lfs diff=lfs merge=lfs -text
35
  *.zst filter=lfs diff=lfs merge=lfs -text
36
  *tfevents* filter=lfs diff=lfs merge=lfs -text
37
- =======
38
  *.png filter=lfs diff=lfs merge=lfs -text
39
- >>>>>>> master
40
  models/starling-lm-7b-alpha.Q8_0.gguf filter=lfs diff=lfs merge=lfs -text
 
 
1
  *.7z filter=lfs diff=lfs merge=lfs -text
2
  *.arrow filter=lfs diff=lfs merge=lfs -text
3
  *.bin filter=lfs diff=lfs merge=lfs -text
 
33
  *.zip filter=lfs diff=lfs merge=lfs -text
34
  *.zst filter=lfs diff=lfs merge=lfs -text
35
  *tfevents* filter=lfs diff=lfs merge=lfs -text
36
+
37
  *.png filter=lfs diff=lfs merge=lfs -text
 
38
  models/starling-lm-7b-alpha.Q8_0.gguf filter=lfs diff=lfs merge=lfs -text