Merge branch 'dev' of git.mingliqiye.com:mingliqiye/pan-disk into dev
# Conflicts: # .gitignore
This commit is contained in:
commit
9de51dd7ee
@ -1,4 +1,4 @@
|
|||||||
[*.{js,jsx,mjs,cjs,ts,tsx,mts,cts,vue,css,scss,sass,less,styl,java}]
|
[*.{js,jsx,mjs,cjs,ts,tsx,mts,cts,vue,css,scss,sass,less,styl}]
|
||||||
charset = utf-8
|
charset = utf-8
|
||||||
indent_size = 2
|
indent_size = 2
|
||||||
indent_style = space
|
indent_style = space
|
||||||
|
1
.gitignore
vendored
1
.gitignore
vendored
@ -39,6 +39,5 @@ node_modules
|
|||||||
dist
|
dist
|
||||||
pnpm-lock.yaml
|
pnpm-lock.yaml
|
||||||
|
|
||||||
src/main/resources/html/**/*
|
|
||||||
src/main/resources/html
|
src/main/resources/html
|
||||||
log
|
log
|
||||||
|
Loading…
x
Reference in New Issue
Block a user