Your Name 078c4cccd0 Default commit 3 napja
..
dist 078c4cccd0 Default commit 3 napja
media 078c4cccd0 Default commit 3 napja
README.md 078c4cccd0 Default commit 3 napja
package.json 078c4cccd0 Default commit 3 napja
package.nls.json 078c4cccd0 Default commit 3 napja

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.