search

SBNSoftware / sbnana

3 stars 14 forks source link

Merge release/SBN2022A into develop #69

Closed cjbacchus closed 2 years ago

cjbacchus commented 2 years ago

Merge release/SBN2022A production branch into develop

cjbacchus commented 2 years ago

I took a look at the merge conflicts, and they are entirely the sbnana version and sbnanaobj version in CMakeLists.txt and product_deps.

I think git checkout develop; git merge release/SBN2022A and manually fixing those two places to the develop versions should do it.