resolve conflicts

Author: mw-kapilg

pom.xml

@@ -6,11 +6,7 @@
 	<parent>
 		<groupId>org.jenkins-ci.plugins</groupId>
 		<artifactId>plugin</artifactId>
-<<<<<<< HEAD
-		<version>4.47</version>
-=======
 		<version>4.75</version>
->>>>>>> dev_main
 		<relativePath />
 	</parent>
 
@@ -29,17 +25,6 @@
 			<email>continuous-integration@mathworks.com</email>
 		</developer>
 	</developers>
-<<<<<<< HEAD
-	<properties>
-		<jenkins.version>2.350</jenkins.version>
-		<java.level>8</java.level>
-	</properties>
-	<name>MATLAB Plugin</name>
-	<description>Jenkins plugin for MATLAB</description>
-	<url>https://github.com/jenkinsci/matlab-plugin</url>
-=======
-
->>>>>>> dev_main
 	<licenses>
 		<license>
 			<name>MIT License</name>
@@ -78,14 +63,8 @@
 		<dependencies>
 			<dependency>
 				<groupId>io.jenkins.tools.bom</groupId>
-<<<<<<< HEAD
-				<artifactId>bom-2.346.x</artifactId>
-				<version>1763.v092b_8980a_f5e</version>
-				<scope>import</scope>
-=======
 				<artifactId>bom-${jenkins.baseline}.x</artifactId>
 				<version>2543.vfb_1a_5fb_9496d</version>
->>>>>>> dev_main
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>

src/main/java/com/mathworks/ci/MatlabBuilderConstants.java

@@ -45,15 +45,12 @@ public class MatlabBuilderConstants {
     public static final String TEST_RESULTS_VIEW_ARTIFACT = "matlabTestResults";
     public static final String BUILD_ARTIFACT = "buildArtifact";
 
-<<<<<<< HEAD
     // MATLAB Test Result Statuses
     public static final String PASSED = "Passed";
     public static final String FAILED = "Failed";
     public static final String INCOMPLETE = "Incomplete";
     public static final String NOT_RUN = "NotRun";
 
-=======
->>>>>>> dev_main
     public static final String NEW_LINE = System.getProperty("line.separator");
 
     // MATLAB Runner Script