Resolved merge conflicts in .gitattributes and README.md
Browse files- .gitattributes +3 -0
- README.md +6 -0
.gitattributes
CHANGED
|
@@ -25,6 +25,9 @@
|
|
| 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 |
+
>>>>>>> 6fe84377b429afeeb263ff080c0e555d5422a345
|
| 31 |
*.tflite filter=lfs diff=lfs merge=lfs -text
|
| 32 |
*.tgz filter=lfs diff=lfs merge=lfs -text
|
| 33 |
*.wasm filter=lfs diff=lfs merge=lfs -text
|
README.md
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
|
|
| 1 |
---
|
| 2 |
language: ja
|
| 3 |
license: mit
|
|
@@ -82,3 +83,8 @@ I would like to thank Mr.Yamada @ikuyamada and Studio ousia @StudioOusia.
|
|
| 82 |
booktitle={EMNLP},
|
| 83 |
year={2020}
|
| 84 |
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<<<<<<< HEAD
|
| 2 |
---
|
| 3 |
language: ja
|
| 4 |
license: mit
|
|
|
|
| 83 |
booktitle={EMNLP},
|
| 84 |
year={2020}
|
| 85 |
}
|
| 86 |
+
=======
|
| 87 |
+
---
|
| 88 |
+
license: mit
|
| 89 |
+
---
|
| 90 |
+
>>>>>>> 6fe84377b429afeeb263ff080c0e555d5422a345
|