Skip to content

Commit 3ed9564

Browse files
committed
fixed CHANGELOG conflict
1 parent 45bd303 commit 3ed9564

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

package/CHANGELOG

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ The rules for this file:
1616
-------------------------------------------------------------------------------
1717
??/??/?? IAlibay, orbeckst, marinegor, tylerjereddy, ljwoods2, marinegor,
1818
spyke7, talagayev, tanii1125, BradyAJohnston, hejamu, jeremyleung521,
19-
harshitgajjela-droid, Dreamstick9
19+
harshitgajjela-droid
2020

2121
* 2.11.0
2222

@@ -41,7 +41,7 @@ Fixes
4141
DSSP by porting upstream PyDSSP 0.9.1 fix (Issue #4913)
4242

4343
Enhancements
44-
* Added HydrogenBondAnalysis benchmark for performance tracking (PR #)
44+
* Added HydrogenBondAnalysis benchmark for performance tracking (PR #5309)
4545
* Improved performance of `AtomGroup.wrap()` with compounds (PR #5220)
4646
* Adds support for parsing `.tpr` files produced by GROMACS 2026.0
4747
* Enables parallelization for analysis.diffusionmap.DistanceMatrix

0 commit comments

Comments
 (0)