Merge branch 'master' into HEAD Conflicts: src/Editor.js src/KeyBinding.js src/Selection.js |
||
|---|---|---|
| .. | ||
| mode | ||
| assertions.js | ||
| EventEmitterTest.js | ||
| MockRenderer.js | ||
| NavigationTest.js | ||
| SelectionTest.js | ||
| TextDocumentTest.js | ||
| TextEditTest.js | ||
Merge branch 'master' into HEAD Conflicts: src/Editor.js src/KeyBinding.js src/Selection.js |
||
|---|---|---|
| .. | ||
| mode | ||
| assertions.js | ||
| EventEmitterTest.js | ||
| MockRenderer.js | ||
| NavigationTest.js | ||
| SelectionTest.js | ||
| TextDocumentTest.js | ||
| TextEditTest.js | ||