Fix conflict crap

pull/137/head
Lennart kats 2015-08-21 15:48:35 +00:00
rodzic a0141b3165
commit c92ff501d9
1 zmienionych plików z 1 dodań i 1 usunięć

Wyświetl plik

@ -63,7 +63,7 @@
"c9.ide.language.javascript": "#8479d0a9c1",
"c9.ide.language.javascript.immediate": "#0535804ada",
"c9.ide.language.javascript.eslint": "#08e0af061f",
"c9.ide.language.javascript.tern": "#76502ed78d",
"c9.ide.language.javascript.tern": "#34d635cb93",
"c9.ide.language.javascript.infer": "#4c9a4282ff",
"c9.ide.language.jsonalyzer": "#0717d1510f",
"c9.ide.collab": "#b49eda3791",