소스 검색

Revert "Don't use SNAPSHOTS"

This reverts commit 175ed500a2625d8c30386dca2cccf19dd060ba1d.
Ralph Plawetzki 7 달 전
부모
커밋
5c34f59d09
1개의 변경된 파일0개의 추가작업 그리고 1개의 파일을 삭제
  1. 0 1
      pom.xml

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