S ee796d8a64 First 2 сар өмнө
..
README.md ee796d8a64 First 2 сар өмнө
package.json ee796d8a64 First 2 сар өмнө
package.nls.json ee796d8a64 First 2 сар өмнө

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.