resolver ultimos conflictos

deepimagej · Jun 15, 2023 · 5220437 · 5220437
1 parent 59ce2cd
commit 5220437
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 55 deletions.
diff --git a/pom.xml b/pom.xml
@@ -11,11 +11,7 @@
 
 	<groupId>io.github.deepimagej</groupId>
 	<artifactId>DeepImageJ_</artifactId>
-<<<<<<< HEAD
-	<version>2.1.16</version>
-=======
 	<version>3.0.1</version>
->>>>>>> development
 
 	<name>DeepImageJ</name>
 	<description>A user-friendly plugin to run deep learning models in ImageJ.</description>
@@ -157,48 +153,6 @@ Universidad Carlos III de Madrid.</license.copyrightOwners>
 			<groupId>net.imagej</groupId>
 			<artifactId>ij</artifactId>
 		</dependency>
-<<<<<<< HEAD
-		<!--  Dependencies for DJL Pytorch, START -->
-		<dependency>
-			<groupId>ai.djl.pytorch</groupId>
-			<artifactId>pytorch-engine</artifactId>
-			<version>0.21.0</version>
-		</dependency>
-		<dependency>
-			<groupId>ai.djl.pytorch</groupId>
-			<artifactId>pytorch-jni</artifactId>
-			<version>1.13.1-0.21.0</version>
-		</dependency>
-		<dependency>
-			<groupId>ai.djl</groupId>
-			<artifactId>api</artifactId>
-			<version>0.21.0</version>
-		</dependency>
-	    <dependency>
-		    <groupId>org.slf4j</groupId>
-		    <artifactId>slf4j-simple</artifactId>
-		    <scope>test</scope>
-		</dependency>
-		<dependency>
-		    <groupId>org.slf4j</groupId>
-		    <artifactId>slf4j-api</artifactId>
-		</dependency>
-		<dependency>
-		    <groupId>net.java.dev.jna</groupId>
-		    <artifactId>jna</artifactId>
-		</dependency>
-		<!--  Dependencies for DJL Pytorch, END -->
-		<dependency>
-		    <groupId>org.jetbrains.bio</groupId>
-		    <artifactId>npy</artifactId>
-	    	<version>0.3.3</version>
-		</dependency>
-		<dependency>
-		    <groupId>org.jetbrains.kotlin</groupId>
-		    <artifactId>kotlin-stdlib</artifactId>
-		</dependency>	
-=======
->>>>>>> development
 		<!-- Test scope dependencies -->
 		<dependency>
 			<groupId>junit</groupId>

diff --git a/src/main/java/DeepImageJ_Run.java b/src/main/java/DeepImageJ_Run.java
@@ -168,18 +168,9 @@ public class DeepImageJ_Run implements PlugIn, ItemListener, Runnable, ActionLis
 
 
 	static public void main(String args[]) {
-<<<<<<< HEAD
-		path = System.getProperty("user.home") + File.separator + "Google Drive" + File.separator + "ImageJ" + File.separator + "models" + File.separator;
-		path = "C:\\Users\\Carlos(tfg)\\Pictures\\Fiji.app\\models" + File.separator;
-		path = "C:\\Users\\angel\\OneDrive\\Documentos\\deepimagej\\fiji-win64\\Fiji.app\\models" + File.separator;
-		//ImagePlus imp = IJ.openImage("C:\\Users\\Carlos(tfg)\\Desktop\\Fiji.app\\models\\Usiigaci_2.1.4\\usiigaci.tif");
-		ImagePlus imp = IJ.openImage("C:\\Users\\angel\\OneDrive\\Documentos\\deepimagej\\fiji-win64\\Fiji.app\\models\\pt\\sample_input_0.tif");
-		//ImagePlus imp = IJ.createImage("aux", 64, 64, 1, 24);
-=======
 		path = new File("models").getAbsolutePath();
 		ImagePlus imp = null;
 		//imp = IJ.openImage(path + "\\pr\\sample_input_0.tif");
->>>>>>> development
 		if (imp != null)
 			imp.show();		WindowManager.setTempCurrentImage(imp);
 		new DeepImageJ_Run().run("");