From 94f6f9c5bdaa857263b312a4916e7afa20603ddc Mon Sep 17 00:00:00 2001
From: Marcus Hoffmann <bubu@bubu1.eu>
Date: Thu, 23 Aug 2018 16:36:37 +0200
Subject: [PATCH] walleth: fix merge conflicts

---
 metadata/org.walleth.txt | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/metadata/org.walleth.txt b/metadata/org.walleth.txt
index 7a5a2d98ea..8229b814f8 100644
--- a/metadata/org.walleth.txt
+++ b/metadata/org.walleth.txt
@@ -135,18 +135,6 @@ Build:0.42.2,422
     prebuild=sed -i -e '/google-services/d'  -e '/withFirebaseCompile/d' build.gradle
     scanignore=build.gradle
 
-Build:0.42.1,421
-    commit=0.42.1
-    subdir=app
-    gradle=withGethNoFirebaseForFDroid
-    prebuild=sed -i -e '/google-services/d'  -e '/withFirebaseCompile/d' build.gradle
-
-Build:0.42.2,422
-    commit=0.42.2
-    subdir=app
-    gradle=withGethNoFirebaseForFDroid
-    prebuild=sed -i -e '/google-services/d'  -e '/withFirebaseCompile/d' build.gradle
-
 Auto Update Mode:Version %v
 Update Check Mode:Tags
 Current Version:0.42.2