Merge remote changes and resolve .gitattributes conflict
Browse files- .gitattributes +5 -0
.gitattributes
CHANGED
|
@@ -1 +1,6 @@
|
|
|
|
|
| 1 |
big_hope/** filter=lfs diff=lfs merge=lfs -text
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
# Local changes
|
| 2 |
big_hope/** filter=lfs diff=lfs merge=lfs -text
|
| 3 |
+
|
| 4 |
+
# Remote changes
|
| 5 |
+
*.bin filter=lfs diff=lfs merge=lfs -text
|
| 6 |
+
*.safetensors filter=lfs diff=lfs merge=lfs -text
|