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 | 0e4520d173a09252d9845783514fc6d2d7f8f610 (patch) | |
tree | 3e4a91cb9bbbbc231725cb0e5e26e19c0b39e038 | |
parent | bc5066275013cf52e70a3ba386b68c72f0e44087 (diff) | |
download | python-setuptools-bitbucket-0e4520d173a09252d9845783514fc6d2d7f8f610.tar.gz |
Update changelog
-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 ----- |