Skip to content

Commit 6f5aeb1

Casflawed Casflawed

authored

Merge branch 'Snailclimb:master' into flameking_work-A

2 parents 9dd6f54 + 537fdce commit 6f5aeb1Copy full SHA for 6f5aeb1

File tree

2 files changed

+7

-1

lines changed

.gitattributes
.gitignore

2 files changed

+7

-1

lines changed

`‎.gitattributes‎`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff 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‎`

Lines changed: 3 additions & 1 deletion

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

0 commit comments

Comments

(0)