summaryrefslogtreecommitdiff
path: root/deadbeef-plugin-lyricbar-git/PKGBUILD
diff options
context:
space:
mode:
authorDeposite Pirate2019-01-28 04:15:07 +0100
committerDeposite Pirate2019-01-28 04:15:07 +0100
commitf5af42cc4ff1b46f90eadde36d42eb5b54afccd6 (patch)
treed017eb9d44bd92c7fe39de23551be88fd86097be /deadbeef-plugin-lyricbar-git/PKGBUILD
parent8a6ac01c1aa5d7d434b7b18fb4df83974a8b1ae9 (diff)
* Unfuck merge
modified: deadbeef-plugin-lyricbar-git/.SRCINFO modified: deadbeef-plugin-lyricbar-git/PKGBUILD
Diffstat (limited to 'deadbeef-plugin-lyricbar-git/PKGBUILD')
-rw-r--r--deadbeef-plugin-lyricbar-git/PKGBUILD5
1 files changed, 0 insertions, 5 deletions
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"