Skip to content

Commit 6f5aeb1

Browse files
authored
Merge branch 'Snailclimb:master' into flameking_work-A
2 parents 9dd6f54 + 537fdce commit 6f5aeb1

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

.gitattributes

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
* text=auto
2+
*.js linguist-language=java
3+
*.css linguist-language=java
4+
*.html linguist-language=java

.gitignore

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
/node_modules
2-
/package-lock.json
2+
/package-lock.json
3+
/dist
4+
.DS_Store

0 commit comments

Comments
 (0)