resolve conflict
Browse files
README.md
CHANGED
@@ -1,3 +1,3 @@
|
|
1 |
version https://git-lfs.github.com/spec/v1
|
2 |
-
oid sha256:
|
3 |
-
size
|
|
|
1 |
version https://git-lfs.github.com/spec/v1
|
2 |
+
oid sha256:b5b12279c900b75f8204680334a952bd2cae80e03e7d0c9951b1778a0a5297e4
|
3 |
+
size 5007
|