From 2f1b5109d644610d16618a63959fc7300cf72425 Mon Sep 17 00:00:00 2001
From: Ralph Plawetzki <ralph@purejava.org>
Date: Tue, 20 Aug 2024 08:19:29 +0200
Subject: [PATCH] New, widened integrations-api

---
 pom.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 337622e6c..3290b3121 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,6 @@
 		<nonModularGroupIds>org.ow2.asm,org.apache.jackrabbit,org.apache.httpcomponents</nonModularGroupIds>
 
 		<!-- cryptomator dependencies -->
-<<<<<<< HEAD
 		<cryptomator.cryptofs.version>2.7.1</cryptomator.cryptofs.version>
 		<cryptomator.integrations.version>1.4.0</cryptomator.integrations.version>
 		<cryptomator.integrations.win.version>1.3.0</cryptomator.integrations.win.version>