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

resolve conflict

Browse source
This commit is contained in:
Christian Schabesberger 2017-01-22 14:26:01 +01:00
commit 849a45a3ca
23 changed files with 1081 additions and 322 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/build.gradle
View file

@ -46,5 +46,6 @@ dependencies {
compile 'com.google.code.gson:gson:2.4'
compile 'com.nononsenseapps:filepicker:3.0.0'
testCompile 'junit:junit:4.12'
testCompile 'org.mockito:mockito-core:1.10.19'
compile 'ch.acra:acra:4.9.0'
}