Sulkta-OSS/straw
3
0
Fork 0
Code Issues 1 Pull requests 11 Projects Releases Packages Wiki Activity Actions

Conflict resolution.

Browse source
This commit is contained in:
krtkush 2018-12-28 18:07:54 +05:30
commit 0367c515f3
77 changed files with 8269 additions and 2352 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/build.gradle
View file

@ -6,7 +6,7 @@ android {
defaultConfig {
applicationId "org.schabi.newpipe"
minSdkVersion 15
minSdkVersion 19
targetSdkVersion 28
versionCode 69
versionName "0.14.2"
@ -57,7 +57,7 @@ dependencies {
exclude module: 'support-annotations'
})
implementation 'com.github.TeamNewPipe:NewPipeExtractor:32d316330c26'
implementation 'com.github.TeamNewPipe:NewPipeExtractor:91b1efc97e'
testImplementation 'junit:junit:4.12'
testImplementation 'org.mockito:mockito-core:2.23.0'