3 commits

Author	SHA1	Message	Date
Filipa Lacerda	75f692748d	Removes merge conflicts vue code from globalnamespace	2018-06-13 12:35:32 +01:00
Phil Hughes	8750507b5d	Convert merge_conflict_service.js to axios	2018-01-30 16:47:19 +00:00
winniehell	572f9782d5	Remove .es6 from file extensions (!9241)	2017-03-05 21:22:40 +01:00

Renamed from app/assets/javascripts/merge_conflicts/merge_conflict_service.js.es6 (Browse further)