Remove git conflict text

kbase / kb_sdk

Build and test new apps for the KBase platform

http://kbase.github.io/kb_sdk_docs

MIT License

26 stars 32 forks source link

Closed jayrbolton closed 5 years ago

jayrbolton commented 5 years ago

@JamesJeffryes Not sure how this got in there

JamesJeffryes commented 5 years ago

🤷‍♂️ Looks OK to merge to me