summarylogtreecommitdiffstats
path: root/PKGBUILD
diff options
context:
space:
mode:
authorMetal2015-06-17 10:15:57 +0200
committerMetal2015-06-17 10:15:57 +0200
commitaa5875c60fd42252158bb2a3e0cc4977dab97b23 (patch)
tree1fc4eb0815cd26d6fb524b79f3fd6b9301286ef8 /PKGBUILD
parenta21c0f5d7f1bbefce7a60e4e38abf1f7b5482551 (diff)
parent7a940831c5633e09c3e1ffce7f1024b091659c78 (diff)
downloadaur-aa5875c60fd42252158bb2a3e0cc4977dab97b23.tar.gz
Merge branch 'master' of ssh://aur4.archlinux.org/magicassistant-gtk
Diffstat (limited to 'PKGBUILD')
-rw-r--r--PKGBUILD5
1 files changed, 5 insertions, 0 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 3fde78fa04fc..4ccf321c2456 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -14,8 +14,13 @@ source_x86_64=(http://downloads.sourceforge.net/project/mtgbrowser/Magic_Assista
source_x86=(http://downloads.sourceforge.net/project/mtgbrowser/Magic_Assistant/${pkgver}/magicassistant-${pkgver}-linux.gtk.x86.zip magicassistant.desktop)
md5sums_x86_64=('65884e4a7666ff510938cb21f171f8dc'
'37f143dbb28032d4fcc7a0a6e4e7f239')
+<<<<<<< HEAD
md5sums_x86=('2336f6b62536137bafc8ded226551d6d'
'37f143dbb28032d4fcc7a0a6e4e7f239')
+=======
+md5sums_x86_64=('2336f6b62536137bafc8ded226551d6d'
+ '37f143dbb28032d4fcc7a0a6e4e7f239')
+>>>>>>> 7a940831c5633e09c3e1ffce7f1024b091659c78
package() {
msg "Installing..."