Closed valotas closed 8 years ago
Done
@valotas This pull request has merge conflicts, please resolve.
+1 @maxwellpeterson-wf @jayudey-wf
@valotas This pull request has merge conflicts, please resolve.
@valotas , If we intend on moving ahead with this, can you resolve the merge conflicts?
@dustinlessard-wf I almost forgot that.
I fixed the conflicts last time, but I don't feel like doing it every month or so :). So let me know if you feel like merging it and I'll fix them.
@valotas would you mind merging this PR to address the merge conflicts? https://github.com/valotas/karma-jspm/pull/1
@evanweible-wf I've merged your pr but there were some remaining warnings that I've fixed. It looks like this PR can be merged now. Thanks a lot for the pr anyway!
+1
@trentgrover-wf @maxwellpeterson-wf @dustinlessard-wf
+1
+1
@jayudey-wf ready for merge
QA Resource Approval: +10
Merging into master.
Make use of basic eslint rules and fixed warnings