Commit Graph

4 Commits

Author SHA1 Message Date
Alfredo Sumaran 6dbca36490 Fix Merge Conflicts app to make it work with Vue 2 2016-11-10 17:53:34 +03:00
Fatih Acet a1fc04dfad VueJSMigration: Remove parallel-conflict-line component.
It's because Vue says: "Component template should contain exactly one root element".
2016-11-10 17:53:34 +03:00
winniehell 02f94cf038 disable ESLint for all JavaScript files 2016-10-26 10:02:58 +02:00
Alfredo Sumaran c4142cf9c0 Improve components for PhantomJs compatibility 2016-10-13 14:16:35 -05:00