Fix PKGBUILD

1 files changed, 1 insertions, 6 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 4ccf321c2456..955765d3e913 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=magicassistant-gtk
 pkgver=1.4.2.010
-pkgrel=1
+pkgrel=2
 pkgdesc="Card Browser, Library Organizer, Deck Builder and Tournament Manager for Magic the Gathering Card Game"
 arch=(i686 x86_64)
 url="http://sourceforge.net/projects/mtgbrowser/"
@@ -14,13 +14,8 @@ 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..."