Skip to content

Commit

Permalink
1.merge conflict fix
Browse files Browse the repository at this point in the history
  • Loading branch information
Justson committed Apr 26, 2021
1 parent 809af68 commit 604d4b0
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ dependencies {
implementation 'com.google.android.material:material:1.0.0'
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
testImplementation 'junit:junit:4.12'
// implementation project(':library')
api 'com.download.library:downloader-androidx:4.1.5'
implementation project(':library')
// api 'com.download.library:downloader-androidx:4.1.5'
implementation 'com.just.agentweb:agentweb-androidx:4.1.4'
implementation 'com.squareup.picasso:picasso:2.71828'
implementation 'com.liulishuo.filedownloader:library:1.7.4'
Expand Down

0 comments on commit 604d4b0

Please sign in to comment.