devel << release-20.07 (conflict solved)

I2PC / xmippCore

Core functions for Xmipp and sharing with other packages (like Scipion)

GNU General Public License v3.0

4 stars 2 forks source link

Closed dmaluenda closed 4 years ago

dmaluenda commented 4 years ago

I'm opening a new PR in order to fix the conflict in https://github.com/I2PC/xmippCore/pull/77 while keeping the https://github.com/I2PC/xmippCore/commit/c026bd88ae43ef071da462e6d7c1f69749f08ba2 commit which fixes a bug. The bug fixing introduced by that commit is already in devel.

dmaluenda commented 4 years ago

Then, it replaces #77. So, I'm closing it.