walleth: fix merge conflicts
This commit is contained in:
parent
3eabb2cf76
commit
94f6f9c5bd
|
@ -135,18 +135,6 @@ Build:0.42.2,422
|
||||||
prebuild=sed -i -e '/google-services/d' -e '/withFirebaseCompile/d' build.gradle
|
prebuild=sed -i -e '/google-services/d' -e '/withFirebaseCompile/d' build.gradle
|
||||||
scanignore=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
|
Auto Update Mode:Version %v
|
||||||
Update Check Mode:Tags
|
Update Check Mode:Tags
|
||||||
Current Version:0.42.2
|
Current Version:0.42.2
|
||||||
|
|
Loading…
Reference in a new issue