summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES.txt1
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