walleth: fix merge conflicts

This commit is contained in:
Marcus Hoffmann 2018-08-23 16:36:37 +02:00
parent 3eabb2cf76
commit 94f6f9c5bd

View file

@ -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