From d3fcdbe1716b64f391fa34ecfc7bf071841ef7c9 Mon Sep 17 00:00:00 2001
From: Fabio Alessandro Locati <fabio@locati.cc>
Date: Apr 26 2016 16:50:48 +0000
Subject: Fix merge conflicts


---

diff --git a/.gitignore b/.gitignore
index 3d6d44c..4ee60cc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,4 @@
 /python-gnupg-0.3.5.tar.gz
 /python-gnupg-0.3.6.tar.gz
 /python-gnupg-0.3.7.tar.gz
-<<<<<<< HEAD
-=======
 /python-gnupg-0.3.8.tar.gz
->>>>>>> master
diff --git a/sources b/sources
index 85b73a7..5b1d878 100644
--- a/sources
+++ b/sources
@@ -1,5 +1 @@
-<<<<<<< HEAD
-ce600421b8168bd7d9470d6b451594d5  python-gnupg-0.3.7.tar.gz
-=======
 54d312056cb8903358bdd0a18522f702  python-gnupg-0.3.8.tar.gz
->>>>>>> master