解决冲突

219e6ed9 · Skyeye云 · 6b45f9ba · 8c640cc5 · 219e6ed9
隐藏空白更改
内联并排

Showing with 3 addition and 0 deletion

.gitattributes .gitattributes +3 -0

未找到文件。
--- a/.gitattributes
+++ b/.gitattributes
+*.js linguist-language=java
+*.css linguist-language=java
+*.html linguist-language=java