Resolved merge conflicts and completed merge
Browse files- .gitattributes +6 -0
- README.md +6 -0
.gitattributes
CHANGED
|
@@ -1,6 +1,9 @@
|
|
| 1 |
<<<<<<< HEAD
|
|
|
|
| 2 |
*.pkl filter=lfs diff=lfs merge=lfs -text
|
| 3 |
=======
|
|
|
|
|
|
|
| 4 |
*.7z filter=lfs diff=lfs merge=lfs -text
|
| 5 |
*.arrow filter=lfs diff=lfs merge=lfs -text
|
| 6 |
*.bin filter=lfs diff=lfs merge=lfs -text
|
|
@@ -36,4 +39,7 @@ saved_model/**/* filter=lfs diff=lfs merge=lfs -text
|
|
| 36 |
*.zip filter=lfs diff=lfs merge=lfs -text
|
| 37 |
*.zst filter=lfs diff=lfs merge=lfs -text
|
| 38 |
*tfevents* filter=lfs diff=lfs merge=lfs -text
|
|
|
|
| 39 |
>>>>>>> 6049703417b9ac54ea95a1c24e51f5cebdb498f8
|
|
|
|
|
|
|
|
|
| 1 |
<<<<<<< HEAD
|
| 2 |
+
<<<<<<< HEAD
|
| 3 |
*.pkl filter=lfs diff=lfs merge=lfs -text
|
| 4 |
=======
|
| 5 |
+
=======
|
| 6 |
+
>>>>>>> 264d7a1bc2194e91fe184bfa43f453ad85141035
|
| 7 |
*.7z filter=lfs diff=lfs merge=lfs -text
|
| 8 |
*.arrow filter=lfs diff=lfs merge=lfs -text
|
| 9 |
*.bin filter=lfs diff=lfs merge=lfs -text
|
|
|
|
| 39 |
*.zip filter=lfs diff=lfs merge=lfs -text
|
| 40 |
*.zst filter=lfs diff=lfs merge=lfs -text
|
| 41 |
*tfevents* filter=lfs diff=lfs merge=lfs -text
|
| 42 |
+
<<<<<<< HEAD
|
| 43 |
>>>>>>> 6049703417b9ac54ea95a1c24e51f5cebdb498f8
|
| 44 |
+
=======
|
| 45 |
+
>>>>>>> 264d7a1bc2194e91fe184bfa43f453ad85141035
|
README.md
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
|
|
| 1 |
---
|
| 2 |
title: ML App
|
| 3 |
emoji: 💻
|
|
@@ -10,3 +11,8 @@ short_description: For ML project
|
|
| 10 |
---
|
| 11 |
|
| 12 |
Check out the configuration reference at https://huggingface.co/docs/hub/spaces-config-reference
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<<<<<<< HEAD
|
| 2 |
---
|
| 3 |
title: ML App
|
| 4 |
emoji: 💻
|
|
|
|
| 11 |
---
|
| 12 |
|
| 13 |
Check out the configuration reference at https://huggingface.co/docs/hub/spaces-config-reference
|
| 14 |
+
=======
|
| 15 |
+
---
|
| 16 |
+
license: mit
|
| 17 |
+
---
|
| 18 |
+
>>>>>>> 264d7a1bc2194e91fe184bfa43f453ad85141035
|