From dfaa79937fb4e2bb4c68f653aff825afed187f18 Mon Sep 17 00:00:00 2001
From: Michele Baldessari <michele@acksyn.org>
Date: Fri, 23 Dec 2016 09:44:05 +0100
Subject: [PATCH] New upstream release

---
 python-mutagen.spec | 1 -
 1 file changed, 1 deletion(-)

diff --git a/python-mutagen.spec b/python-mutagen.spec
index 177496a..618d291 100644
--- a/python-mutagen.spec
+++ b/python-mutagen.spec
@@ -132,7 +132,6 @@ pushd %{py3dir}
 %endif
 
 %changelog
-<<<<<<< HEAD
 * Fri Dec 23 2016 Michele Baldessari <michele@acksyn.org> - 1.36-1
 - New upstream release