fixed merge issues
Browse files- .gitattributes +4 -0
- README.md +6 -1
.gitattributes
CHANGED
|
@@ -25,6 +25,10 @@
|
|
| 25 |
*.safetensors filter=lfs diff=lfs merge=lfs -text
|
| 26 |
saved_model/**/* filter=lfs diff=lfs merge=lfs -text
|
| 27 |
*.tar.* filter=lfs diff=lfs merge=lfs -text
|
|
|
|
|
|
|
|
|
|
|
|
|
| 28 |
*.tflite filter=lfs diff=lfs merge=lfs -text
|
| 29 |
*.tgz filter=lfs diff=lfs merge=lfs -text
|
| 30 |
*.wasm filter=lfs diff=lfs merge=lfs -text
|
|
|
|
| 25 |
*.safetensors filter=lfs diff=lfs merge=lfs -text
|
| 26 |
saved_model/**/* filter=lfs diff=lfs merge=lfs -text
|
| 27 |
*.tar.* filter=lfs diff=lfs merge=lfs -text
|
| 28 |
+
<<<<<<< HEAD
|
| 29 |
+
=======
|
| 30 |
+
*.tar filter=lfs diff=lfs merge=lfs -text
|
| 31 |
+
>>>>>>> 7f8ed6f09c0f926699d7da4562d44feab8a2df18
|
| 32 |
*.tflite filter=lfs diff=lfs merge=lfs -text
|
| 33 |
*.tgz filter=lfs diff=lfs merge=lfs -text
|
| 34 |
*.wasm filter=lfs diff=lfs merge=lfs -text
|
README.md
CHANGED
|
@@ -1,4 +1,5 @@
|
|
| 1 |
---
|
|
|
|
| 2 |
pipeline_tag: image-to-text
|
| 3 |
tags:
|
| 4 |
- image-captioning
|
|
@@ -145,4 +146,8 @@ print(processor.decode(out[0], skip_special_tokens=True))
|
|
| 145 |
|
| 146 |
copyright = {Creative Commons Attribution 4.0 International}
|
| 147 |
}
|
| 148 |
-
```
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
---
|
| 2 |
+
<<<<<<< HEAD
|
| 3 |
pipeline_tag: image-to-text
|
| 4 |
tags:
|
| 5 |
- image-captioning
|
|
|
|
| 146 |
|
| 147 |
copyright = {Creative Commons Attribution 4.0 International}
|
| 148 |
}
|
| 149 |
+
```
|
| 150 |
+
=======
|
| 151 |
+
license: apache-2.0
|
| 152 |
+
---
|
| 153 |
+
>>>>>>> 7f8ed6f09c0f926699d7da4562d44feab8a2df18
|