mol/my-dev-server2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test
Some checks failed
continuous-integration/drone/push Build is failing
Details

Browse Source
This commit is contained in:
mol
2024-07-06 22:23:31 +08:00
parent 08173d8497
commit 263cb5ef03
1663 changed files with 526884 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
vscode-server-linux-x64-web/extensions/merge-conflict/README.md Normal file
View File

@ -0,0 +1,7 @@
# Merge Conflict
**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.
## Features
See [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.