From 175ed500a2625d8c30386dca2cccf19dd060ba1d Mon Sep 17 00:00:00 2001
From: Ralph Plawetzki <ralph@purejava.org>
Date: Sun, 4 Aug 2024 14:41:07 +0200
Subject: [PATCH] Don't use SNAPSHOTS

---
 pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pom.xml b/pom.xml
index 3290b3121..337622e6c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,6 +33,7 @@
 		<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>