search

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

Fix Merge Conflicts #361

Closed bio-boris closed 3 years ago

bio-boris commented 3 years ago

Fix Merge Conflicts in order to merge to master. Both dev and master are protected

bio-boris commented 3 years ago

?!?! is master just a broken branch? and we should override the entire src/java/us/kbase/mobu/ModuleBuilder.java file??