Ver código fonte

Don't use SNAPSHOTS

Ralph Plawetzki 10 meses atrás
pai
commit
175ed500a2
1 arquivos alterados com 1 adições e 0 exclusões
  1. 1 0
      pom.xml

+ 1 - 0
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>