commit 452e109f3950d242bd05d22bc8e6f09e629784ca Author: Martin Gansser <mgansser at alice.de> Date: Sun Jan 4 13:17:15 2015 +0100 update to 3.2.0 clog | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) --- diff --git a/clog b/clog index 7809fe1..6cda48b 100644 --- a/clog +++ b/clog @@ -1,2 +1,2 @@ -<<<<<<< HEAD +update to 3.2.0