merge conflicts from main #675
Merged
Conversation
This file contains 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
updates: - [github.com/psf/black: 22.3.0 → 22.6.0](psf/black@22.3.0...22.6.0) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
for more information, see https://pre-commit.ci
…pology Forcefield XML writers and Topology to ForceField Conversion
|
This pull request introduces 4 alerts when merging 9f1686d into d95fd5b - view on LGTM.com new alerts:
|
Codecov Report
@@ Coverage Diff @@
## develop #675 +/- ##
===========================================
- Coverage 91.22% 91.22% -0.01%
===========================================
Files 63 63
Lines 5061 5160 +99
===========================================
+ Hits 4617 4707 +90
- Misses 444 453 +9
Continue to review full report at Codecov.
|
|
This pull request introduces 2 alerts when merging 6ad3819 into d95fd5b - view on LGTM.com new alerts:
|
|
This pull request introduces 1 alert when merging e0d8f3e into d95fd5b - view on LGTM.com new alerts:
|
for more information, see https://pre-commit.ci
|
This pull request introduces 1 alert when merging 04b5f08 into d95fd5b - view on LGTM.com new alerts:
|
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.
Merge in updates to main branch.