mirror of
https://gitee.com/sui-feng-cb/AzurLaneAutoScript1
synced 2026-03-12 02:48:23 +08:00
merge alas
This commit is contained in:
3
webapp/.gitattributes
vendored
3
webapp/.gitattributes
vendored
@@ -1,7 +1,4 @@
|
||||
.github/actions/**/*.js linguist-detectable=false
|
||||
scripts/*.js linguist-detectable=false
|
||||
*.config.js linguist-detectable=false
|
||||
<<<<<<< HEAD
|
||||
* text=auto eol=lf
|
||||
=======
|
||||
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
|
||||
|
||||
Reference in New Issue
Block a user