[wxsqlite3/f21] update to 3.2.0

[Martin Gansser]

commit 8aef99c41227f57d0e0b57e8386b85b3bc40c551
Author: Martin Gansser <mgansser at alice.de>
Date:   Sun Jan 4 12:11:52 2015 +0100

    update to 3.2.0

 sources |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)
---
diff --git a/sources b/sources
index 30ea2dd..214c389 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,2 @@
 97ed1ec2f5a37db37d1c19afdb4164c9  wxsqlite3-3.0.3.pc.in
-<<<<<<< HEAD
-=======
 618476322516de436c770a2fe405e26e  wxsqlite3-3.2.0.tar.gz
->>>>>>> master