Skip to content

P
pda-ui
Commit f855c301 authored by 赵汉亭's avatar 赵汉亭
Browse files
Options

冲突修改

parent a8751e5b
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 35 deletions
.gitignore
View file @ f855c301
<<<<<<< HEAD
.DS_Store .DS_Store
=======
<<<<<<< Updated upstream
.DS_Store
=======
#.DS_Store
>>>>>>> Stashed changes
>>>>>>> 0a028f6bcbb29205351e9b390599bffc80e9120f
node_modules/ node_modules/
dist/ dist/
npm-debug.log* npm-debug.log*
yarn-debug.log* yarn-debug.log*
yarn-error.log* yarn-error.log*
**/*.log **/*.log
<<<<<<< HEAD
=======
<<<<<<< Updated upstream
>>>>>>> 0a028f6bcbb29205351e9b390599bffc80e9120f
tests/**/coverage/ tests/**/coverage/
tests/e2e/reports tests/e2e/reports
...@@ -33,29 +21,6 @@ selenium-debug.log ...@@ -33,29 +21,6 @@ selenium-debug.log
.editorconfig .editorconfig
.eslintignore .eslintignore
.eslintrc.js .eslintrc.js
<<<<<<< HEAD
# .env.*
=======
.env.* .env.*
=======
#
#tests/**/coverage/
#tests/e2e/reports
#selenium-debug.log
#
## Editor directories and files
.idea
.vscode
#*.suo
#*.ntvs*
#*.njsproj
#*.sln
#*.local
.editorconfig
.eslintignore
.eslintrc.js
#.env.*
>>>>>>> Stashed changes
>>>>>>> 0a028f6bcbb29205351e9b390599bffc80e9120f
package-lock.json package-lock.json
yarn.lock yarn.lock
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment