Really screwed up the rebase

3 files changed, 3 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index dd22618b8746..a858323d8186 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -16,7 +16,7 @@ pkgbase = econnman-git
 	source = bindings-update.patch
 	source = configure.patch
 	md5sums = SKIP
-	md5sums = 7a3d14c2ce0412e2fc503d278401a035
+	md5sums = f07a35832209505768c7fcd375a2de59
 	md5sums = 9006b3b8d28dbd9a944c497fec40d79f
 
 pkgname = econnman-git
diff --git a/.gitignore b/.gitignore
index 23fcafcc4b6a..48f7eb23d6cc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,5 @@
 src/
 pkg/
 *.tar.*
-<<<<<<< HEAD
-=======
 *.log
->>>>>>> Makepkg 4.1 update
+
diff --git a/PKGBUILD b/PKGBUILD
index a0193db7ab11..126038b272c0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -16,7 +16,7 @@ source=("git://git.enlightenment.org/apps/$_pkgname.git"
         'bindings-update.patch'
         'configure.patch')
 md5sums=('SKIP'
-         '7a3d14c2ce0412e2fc503d278401a035'
+         'f07a35832209505768c7fcd375a2de59'
          '9006b3b8d28dbd9a944c497fec40d79f')
 
 pkgver() {