summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--deadbeef-plugin-lyricbar-git/.SRCINFO5
-rw-r--r--deadbeef-plugin-lyricbar-git/PKGBUILD5
2 files changed, 0 insertions, 10 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
diff --git a/deadbeef-plugin-lyricbar-git/PKGBUILD b/deadbeef-plugin-lyricbar-git/PKGBUILD
index e2860b5..df7ce64 100644
--- a/deadbeef-plugin-lyricbar-git/PKGBUILD
+++ b/deadbeef-plugin-lyricbar-git/PKGBUILD
@@ -4,13 +4,8 @@
_pkgname=deadbeef-lyricbar
pkgname=deadbeef-plugin-lyricbar-git
-<<<<<<< HEAD
pkgver=r66.g39b9568
pkgrel=1
-=======
-pkgver=r60.ga08374c
-pkgrel=2
->>>>>>> f2177fdbd14794575ba8d65500a2dd3d85f0fb1b
pkgdesc="DeaDBeeF lyric bar plugin"
arch=('i686' 'x86_64')
url="https://github.com/C0rn3j/deadbeef-lyricbar"