TASK-935: Callback server failhard squash

kbase / kb_sdk

Build and test new apps for the KBase platform

http://kbase.github.io/kb_sdk_docs

MIT License

27 stars 32 forks source link

TASK-935: Callback server failhard squash #259

Closed arfathpasha closed 7 years ago

MrCreosote commented 7 years ago

Not sure why, but there's a couple of commits in this PR that shouldn't be in here

arfathpasha commented 7 years ago

I found that strange too. I fetched recent changes, did a merge and then PR. But it looks like what I fetched became part of the PR. The PR step strangely didn't complain about merge conflicts despite the fetch becoming part of the PR. I have not seen this happen before and I am not sure what I did wrong to make it happen.