Fix merge conflict

2 files changed, 6 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a1de41df9bf8..17c76aaa2f87 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -14,8 +14,10 @@ pkgbase = melonds-git
 	makedepends = cmake
 	depends = gtk3
 	depends = pkg-config
+	depends = sdl2
+	provides = melonds
 	conflicts = melonds
-	source = melonds::git://github.com/StapleButter/melonds.git
+	source = melonDS::git+https://github.com/Arisotura/melonDS.git
 	md5sums = SKIP
 
 pkgname = melonds-git
diff --git a/PKGBUILD b/PKGBUILD
index da0f9317a41b..a56eb871ffba 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,6 @@
 
 pkgname=melonds-git
 _gitname=melonds
-_releasever=0.8.3
 pkgver=0.8.3.r1016.e512e7a
 pkgdesc='DS emulator, sorta. also 1st quality melon.'
 pkgrel=1
@@ -10,9 +9,9 @@ arch=('i686' 'x86_64' 'arm' 'armv6h' 'armv7h' 'aarch64')
 url="http://melonds.kuribo64.net/"
 license=('GPLv3')
 makedepends=('git' 'cmake')
-depends=('gtk3' 'pkg-config')
-source=("${_gitname}::git://github.com/StapleButter/${_gitname}.git")
-provdes=('melonds')
+depends=('gtk3' 'pkg-config' 'sdl2')
+source=("${_gitname}::git+https://github.com/Arisotura/${_gitname}.git")
+provides=('melonds')
 conflicts=('melonds')
 
 md5sums=('SKIP')