Alfredo Sumaran 6dbca36490 Fix Merge Conflicts app to make it work with Vue 2		2016-11-10 17:53:34 +03:00
..
diff_file_editor.js.es6	Migrate Vue v1 to v2.	2016-11-10 17:53:34 +03:00
inline_conflict_lines.js.es6	disable ESLint for all JavaScript files	2016-10-26 10:02:58 +02:00
parallel_conflict_lines.js.es6	Fix Merge Conflicts app to make it work with Vue 2	2016-11-10 17:53:34 +03:00