Merge #153 (Weex) with main

0ex · Oct 27, 2022 · d18af5d · d18af5d
2 parents 1ec89f3 + 319d6f3
commit d18af5d
Show file tree

Hide file tree

Showing 15 changed files with 2,571 additions and 1,792 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,3 +1,2 @@
-* text=auto
+* text=auto eol=lf
 *.ai binary
-readme.md merge=union
diff --git a/LICENSE b/LICENSE
diff --git a/README.md b/README.md
diff --git a/awesome.md b/awesome.md
diff --git a/code-of-conduct.md b/code-of-conduct.md
diff --git a/contributing.md b/contributing.md
diff --git a/create-list.md b/create-list.md