Alfredo Sumaran 54bfe70795 Add more tests to check conflicts resolution		2016-10-13 14:16:35 -05:00
..
components	Improve components for PhantomJs compatibility	2016-10-13 14:16:35 -05:00
mixins	Improve components for PhantomJs compatibility	2016-10-13 14:16:35 -05:00
merge_conflict_service.js.es6	Refactor JS code	2016-10-13 14:16:35 -05:00
merge_conflict_store.js.es6	Add more tests to check conflicts resolution	2016-10-13 14:16:35 -05:00
merge_conflicts_bundle.js.es6	Improve components for PhantomJs compatibility	2016-10-13 14:16:35 -05:00