summaryrefslogtreecommitdiff
path: root/deadbeef-plugin-lyricbar-git/.SRCINFO
diff options
context:
space:
mode:
Diffstat (limited to 'deadbeef-plugin-lyricbar-git/.SRCINFO')
-rw-r--r--deadbeef-plugin-lyricbar-git/.SRCINFO5
1 files changed, 0 insertions, 5 deletions
diff --git a/deadbeef-plugin-lyricbar-git/.SRCINFO b/deadbeef-plugin-lyricbar-git/.SRCINFO
index 024629f..ae0890e 100644
--- a/deadbeef-plugin-lyricbar-git/.SRCINFO
+++ b/deadbeef-plugin-lyricbar-git/.SRCINFO
@@ -1,12 +1,7 @@
pkgbase = deadbeef-plugin-lyricbar-git
pkgdesc = DeaDBeeF lyric bar plugin
-<<<<<<< HEAD
pkgver = r66.g39b9568
pkgrel = 1
-=======
- pkgver = r60.ga08374c
- pkgrel = 2
->>>>>>> f2177fdbd14794575ba8d65500a2dd3d85f0fb1b
url = https://github.com/C0rn3j/deadbeef-lyricbar
arch = i686
arch = x86_64