search

nstack-io / nstack-ios-sdk

MIT License
5 stars 10 forks source link

Adding Nicolai's changes #49

Closed mariusc closed 4 years ago

mariusc commented 4 years ago

43 had conflict markers in source code; that needed to be fixed.

I don't have push access to the fork, so I've taken that branch, removed the conflict markers and pushed it as a branch on this repo. I'll close #43 and we'll merge this one instead, with Nicolai's changes and the conflict markers removed