Solve git conflicts

Signed-off-by: alperozturk <alper_ozturk@proton.me>

settings.gradle

@@ -13,10 +13,4 @@ include ':appscan'
 //    dependencySubstitution {
 //        substitute module('com.github.nextcloud:android-library') using project(':library')
 //    }
-//}
-
-includeBuild('/Users/alperozturk/Desktop/nextcloud/nextcloud_android_library') {
-    dependencySubstitution {
-        substitute module('com.github.nextcloud:android-library') using project(':library')
-    }
-}
+//}