fix merge conflicts (#62)

JopSchaap · Apr 6, 2024 · d1c6681 · d1c6681
1 parent cc3ad31
commit d1c6681
Showing 1 changed file with 0 additions and 12 deletions.
diff --git a/debug/build.gradle b/debug/build.gradle
@@ -65,18 +65,6 @@ dependencies {
     // Testing
     testImplementation "junit:junit:$junit_version"
 
-    // Transitive dependencies
-    implementation "androidx.core:core:$core_version"
-    implementation "androidx.fragment:fragment:$fragment_version"
-    implementation "androidx.lifecycle:lifecycle-common:$lifecycle_version"
-    implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_version"
-    implementation "androidx.navigation:navigation-fragment:$nav_version"
-    implementation "androidx.navigation:navigation-runtime:$nav_version"
-    implementation(project(':ipv8')) {
-        exclude module: 'lazysodium-java'
-    }
-    testImplementation "junit:junit:$junit_version"
-
     // Transitive dependencies
     implementation "androidx.core:core:$core_version"
     implementation "androidx.fragment:fragment:$fragment_version"