Closed Starnite closed 7 years ago
Sorry, I was having issues with committing new changes on the mini-pol-assay branch. The final version should be the vz-data-analysis branch.
@Starnite in that case, be sure to do the following:
(1) In GitHub desktop, revert the change 6cdef56. (2) After that, discard changes to the four conflicting files above. (3) Push.
@Starnite: looks like there's an issue here - data compilation code in this branch is conflicting with data compilation code from other branch. Which one should be the one that is final? I suspect it's the other branch; you might have to revert changes from 6cdef56 and discard the changed files in this branch.