Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 81789766 authored by Robert Wiebe's avatar Robert Wiebe
Browse files

Resolve conflict

parent d87da8f2

build.gradle

+1 −4
Original line number Diff line number Diff line
@@ -64,10 +64,7 @@ dependencies { 
    implementation 'commons-io:commons-io:2.6'



    implementation 'com.squareup.retrofit2:retrofit:2.5.0'



    // Use of this old dependency is a decision of the project team to continue with pre Android v5 support.

    // Please do not update this dependency

    implementation 'com.squareup.okhttp3:okhttp:3.12.0'

    implementation 'com.squareup.okhttp3:okhttp:3.12.3'



    // Required for local unit tests (JUnit 4 framework)

    testImplementation 'junit:junit:4.12'