Merge branch 'main' of https://github.com/segment-anything-models-jav…

…a/SAMJ into main
segment-anything-models-java · Apr 20, 2024 · 90cb8fe · 90cb8fe
2 parents 1971aaf + f4467fd
commit 90cb8fe
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -13,7 +13,7 @@
 .idea
 
 # miscellaneous
-*.swp
+*.sw*
 
 /bin/
 
diff --git a/pom.xml b/pom.xml
@@ -153,11 +153,16 @@
 			<groupId>net.imglib2</groupId>
 			<artifactId>imglib2</artifactId>
 		</dependency>
-		<!--<dependency>
+		<!-- 
+		<dependency>
 			<groupId>org.apposed</groupId>
 			<artifactId>appose</artifactId>
 			<version>0.1.1</version>
-		</dependency> -->
+		</dependency>
+		NOTE: dl-modelrunner @ 0.5.5 (which is what is used here)
+		copied-in the apposed project and thus the dependency
+		on apposed is not necessary here.
+		-->
 		<dependency>
 			<groupId>io.bioimage</groupId>
 			<artifactId>dl-modelrunner</artifactId>
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,7 +13,7 @@ @@
     .idea
     # miscellaneous
-    *.swp
+    *.sw*
     /bin/