solve git conflict

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

Author: alperozturk96

library/src/androidTest/java/com/owncloud/android/GetCapabilitiesRemoteOperationIT.java

@@ -157,5 +157,10 @@ private void checkCapability(OCCapability capability, String userId) {
 
         // support
         assertTrue(capability.getHasValidSubscription().isFalse());
+
+        // wcf
+        if (capability.getVersion().isNewerOrEqual(NextcloudVersion.nextcloud_32)) {
+            assertTrue(capability.isWCFEnabled().isFalse());
+        }
     }
 }