solve git conflict

alperozturk96 · alperozturk96 · commit d269978dfdef · 2025-10-29T15:24:25.000+01:00
Signed-off-by: alperozturk &lt;alper_ozturk@proton.me&gt;
diff --git a/library/src/androidTest/java/com/owncloud/android/GetCapabilitiesRemoteOperationIT.java b/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());
+        }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -157,5 +157,10 @@ private void checkCapability(OCCapability capability, String userId) {`
`157`	`157`
`158`	`158`	`// support`
`159`	`159`	`assertTrue(capability.getHasValidSubscription().isFalse());`
	`160`	`+`
	`161`	`+ // wcf`
	`162`	`+ if (capability.getVersion().isNewerOrEqual(NextcloudVersion.nextcloud_32)) {`
	`163`	`+ assertTrue(capability.isWCFEnabled().isFalse());`
	`164`	`+ }`
`160`	`165`	`}`
`161`	`166`	`}`