summaryrefslogtreecommitdiff
path: root/deadbeef-plugin-lyricbar-git/PKGBUILD
diff options
context:
space:
mode:
authorDeposite Pirate2019-01-28 04:11:38 +0100
committerDeposite Pirate2019-01-28 04:11:38 +0100
commit8a6ac01c1aa5d7d434b7b18fb4df83974a8b1ae9 (patch)
treed58f1e7ca982d4868654f72dafb350bb497825af /deadbeef-plugin-lyricbar-git/PKGBUILD
parente56f831d1d64a2646d620abf78c61577538eed7b (diff)
parentf2177fdbd14794575ba8d65500a2dd3d85f0fb1b (diff)
Merge branch 'master' of ssh://git.midgard.lan/git/arch-ports
deadbeef-plugin-lyricbar-git/.SRCINFO deadbeef-plugin-lyricbar-git/PKGBUILD
Diffstat (limited to 'deadbeef-plugin-lyricbar-git/PKGBUILD')
-rw-r--r--deadbeef-plugin-lyricbar-git/PKGBUILD5
1 files changed, 5 insertions, 0 deletions
diff --git a/deadbeef-plugin-lyricbar-git/PKGBUILD b/deadbeef-plugin-lyricbar-git/PKGBUILD
index df7ce64..e2860b5 100644
--- a/deadbeef-plugin-lyricbar-git/PKGBUILD
+++ b/deadbeef-plugin-lyricbar-git/PKGBUILD
@@ -4,8 +4,13 @@
_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"