search

jspm / github

Github Location Service
16 stars 43 forks source link

resolve merge conflicts against master #103

Closed tamird closed 8 years ago

tamird commented 8 years ago

There's one "real" commit in here that trims whitespace, but mostly this is resolving merge conflicts (by blindly taking the 0.17 version).

@guybedford @adamburgess