Your Name
078c4cccd0
Default commit
|
il y a 3 jours | |
|---|---|---|
| .. | ||
| dist | il y a 3 jours | |
| media | il y a 3 jours | |
| README.md | il y a 3 jours | |
| package.json | il y a 3 jours | |
| package.nls.json | il y a 3 jours | |
README.md
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 to learn about features of this extension.