BioGearsEngine / core

Repository for libbiogears and all core utilities
Apache License 2.0
56 stars 48 forks source link

Patching cbc #62

Closed ajbaird closed 2 years ago

ajbaird commented 2 years ago
StevenAWhite commented 2 years ago

I am going to manually merge this once it passes CI

StevenAWhite commented 2 years ago

This is merged. Apparently post merger the UI actually shows me the resolve conflicts button.