diff options
| author | Donald Stufft <donald@stufft.io> | 2014-11-19 21:40:21 -0500 |
|---|---|---|
| committer | Donald Stufft <donald@stufft.io> | 2014-11-19 21:50:27 -0500 |
| commit | 5fa2a4519fc0521ee15b0ce0cad136afe304eb37 (patch) | |
| tree | 268fdc9489a768a901aeb78d7a92a0459c5a6e06 | |
| parent | 6f74eb003ba0df2049a92c60e2ebd6eaa4aba030 (diff) | |
| download | external_python_setuptools-5fa2a4519fc0521ee15b0ce0cad136afe304eb37.tar.gz external_python_setuptools-5fa2a4519fc0521ee15b0ce0cad136afe304eb37.tar.bz2 external_python_setuptools-5fa2a4519fc0521ee15b0ce0cad136afe304eb37.zip | |
fix left over merge indicator8.0b1
| -rw-r--r-- | CHANGES.txt | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index f4d8019a..cc2423b6 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -45,7 +45,6 @@ CHANGES * Issue #262: Fixed regression in pip install due to egg-info directories being omitted. Re-opens Issue #118. ->>>>>>> master ----- 6.0.1 |