# Theia - Merge Conflicts Extension

Helps to resolve merge conflicts.

See [here](https://github.com/theia-ide/theia).

## License
[Apache-2.0](https://github.com/theia-ide/theia/blob/master/LICENSE)