From 7ab8116438ea57a5349ca11a94a2f0ce6a8752ef Mon Sep 17 00:00:00 2001
From: Justin W. Flory (he/him) <git@jwf.io>
Date: Oct 27 2020 21:53:49 +0000
Subject: Resolve an unresolve git merge conflict


Signed-off-by: Justin W. Flory (he/him) <git@jwf.io>

---

diff --git a/mpris-scrobbler.spec b/mpris-scrobbler.spec
index d04c78a..053d416 100644
--- a/mpris-scrobbler.spec
+++ b/mpris-scrobbler.spec
@@ -1,13 +1,8 @@
 %global forgeurl    https://github.com/mariusor/mpris-scrobbler
 
 Name:           mpris-scrobbler
-<<<<<<< HEAD
-Version:        0.4.0
-Release:        3%{?dist}
-=======
 Version:        0.4.0.1
 Release:        1%{?dist}
->>>>>>> 5e355d9... Update to latest upstream (v0.4.0.1) - pre-release version
 Summary:        User daemon to submit currently playing song to LastFM, LibreFM, ListenBrainz
 
 %forgemeta
@@ -142,4 +137,3 @@ player that exposes this interface.
 * Thu Jan 31 2019 Justin W. Flory <jflory7@fedoraproject.org> - 0.3.1-1
 - First release: mpris-scrobbler
 - With guidance and help from  Igor Gnatenko
-