diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2014-10-11 12:53:39 -0400 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2014-10-11 12:53:39 -0400 |
| commit | 06ce668daf98eabfe821b8c7a910d067a2290b56 (patch) | |
| tree | 7e0686512e9edb4e1557af7e52e01bf90b394cc5 /CHANGES.txt | |
| parent | 1559c0d0272da9960530b66fe8ec7cc872d50533 (diff) | |
| download | python-setuptools-git-06ce668daf98eabfe821b8c7a910d067a2290b56.tar.gz | |
Update changelog
Diffstat (limited to 'CHANGES.txt')
| -rw-r--r-- | CHANGES.txt | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index 0f5e56f4..d7e3369d 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -2,6 +2,13 @@ CHANGES ======= +--- +6.1 +--- + +* Issue #268: When resolving package versions, a VersionConflict now reports + which package previously required the conflicting version. + ----- 6.0.2 ----- |