summaryrefslogtreecommitdiffstats
path: root/NEWS
diff options
context:
space:
mode:
authorAlessio Sergi <al3hex@gmail.com>2014-06-14 12:44:24 +0200
committerAlessio Sergi <al3hex@gmail.com>2014-06-14 12:52:26 +0200
commitc29ddd58bf64fc81abe18ebcd2bbaf12c0e61ef5 (patch)
treec9370af4e72c566093c915298057b641b0628620 /NEWS
parent09bdb9de74281553bca86fc0746493ad1987d1ce (diff)
Fix leftovers from merge conflict
Diffstat (limited to 'NEWS')
-rw-r--r--NEWS2
1 files changed, 1 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 86ed5661..e71f384d 100644
--- a/NEWS
+++ b/NEWS
@@ -82,7 +82,7 @@ Version 1.7.5
=============
* Force the Pypi installer to use the PsUtil branch 1.x (#333)
-
+
Version 1.7.4
=============