Repository navigation
chore: resolve merge conflicts - #72
Merged
Merged
Conversation
chore: remove customPQConfig and deprecate NoMetaStructureAdapter
# Conflicts: # src/diffpy/srreal/EmptyStructureAdapter.cpp # src/diffpy/srreal/NoMetaStructureAdapter.cpp # src/diffpy/srreal/NoMetaStructureAdapter.hpp # src/diffpy/srreal/NoSymmetryStructureAdapter.cpp # src/diffpy/srreal/NoSymmetryStructureAdapter.hpp # src/diffpy/srreal/PQEvaluator.cpp # src/diffpy/srreal/PairQuantity.cpp # src/diffpy/srreal/StructureAdapter.hpp # src/tests/TestNoMetaStructureAdapter.hpp # src/tests/test_custompqconfig.hpp
Contributor
Author
|
@sbillinge PR ready for review. |
Contributor
|
yeh, merged! I wonder if we did over the same changes because an earlier issue wasn't closed properly! Anyway, all merged now. @SYMSCAE @cadenmyers13 what is next on the journey to get this out? |
Contributor
|
@sbillinge I think just merge #71 and we can go through the release checklist |
Contributor
Author
|
@cadenmyers13 Maybe you can implement the two doc fix quick so that we're cleared codebase-wise? |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR resolves merge conflicts into main brought by #55.