8 månader sedan · 7b293b8082
--- 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>