Fix broken merge

MOEAFramework · Nov 30, 2023 · e000157 · e000157
1 parent 75a1ce0
commit e000157
Show file tree

Hide file tree

Showing 8 changed files with 0 additions and 307 deletions.
diff --git a/src/main/java/org/moeaframework/benchmarks/CarSideImpact.java b/src/main/java/org/moeaframework/benchmarks/CarSideImpact.java
@@ -1,4 +1,3 @@
-<<<<<<< Updated upstream:src/main/java/org/moeaframework/benchmarks/CarSideImpact/CarSideImpact.java
 /* Copyright 2009-2023 David Hadka and other contributors
  *
  * This file is part of the MOEA Framework.
@@ -16,10 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with the MOEA Framework.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.moeaframework.benchmarks.CarSideImpact;
-=======
 package org.moeaframework.benchmarks;
->>>>>>> Stashed changes:src/main/java/org/moeaframework/benchmarks/CarSideImpact.java
 
 import org.moeaframework.core.Solution;
 import org.moeaframework.core.variable.EncodingUtils;

diff --git a/src/main/java/org/moeaframework/benchmarks/ElectricMotor.java b/src/main/java/org/moeaframework/benchmarks/ElectricMotor.java
@@ -1,4 +1,3 @@
-<<<<<<< Updated upstream:src/main/java/org/moeaframework/benchmarks/ElectricMotor/ElectricMotor.java
 /* Copyright 2009-2023 David Hadka and other contributors
  *
  * This file is part of the MOEA Framework.
@@ -16,10 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with the MOEA Framework.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.moeaframework.benchmarks.ElectricMotor;
-=======
 package org.moeaframework.benchmarks;
->>>>>>> Stashed changes:src/main/java/org/moeaframework/benchmarks/ElectricMotor.java
 
 import org.moeaframework.core.Solution;
 import org.moeaframework.core.variable.EncodingUtils;

diff --git a/src/main/java/org/moeaframework/benchmarks/GenerateReferenceSet.java b/src/main/java/org/moeaframework/benchmarks/GenerateReferenceSet.java
diff --git a/src/main/java/org/moeaframework/benchmarks/LRGV.java b/src/main/java/org/moeaframework/benchmarks/LRGV.java
@@ -1,4 +1,3 @@
-<<<<<<< Updated upstream:src/main/java/org/moeaframework/benchmarks/LRGV/LRGV.java
 /* Copyright 2009-2023 David Hadka and other contributors
  *
  * This file is part of the MOEA Framework.
@@ -16,10 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with the MOEA Framework.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.moeaframework.benchmarks.LRGV;
-=======
 package org.moeaframework.benchmarks;
->>>>>>> Stashed changes:src/main/java/org/moeaframework/benchmarks/LRGV.java
 
 import java.io.File;
 

diff --git a/src/main/java/org/moeaframework/benchmarks/LakeProblem.java b/src/main/java/org/moeaframework/benchmarks/LakeProblem.java
@@ -1,4 +1,3 @@
-<<<<<<< Updated upstream:src/main/java/org/moeaframework/benchmarks/LakeProblem/LakeProblem.java
 /* Copyright 2009-2023 David Hadka and other contributors
  *
  * This file is part of the MOEA Framework.
@@ -16,10 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with the MOEA Framework.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.moeaframework.benchmarks.LakeProblem;
-=======
 package org.moeaframework.benchmarks;
->>>>>>> Stashed changes:src/main/java/org/moeaframework/benchmarks/LakeProblem.java
 
 import java.io.File;
 

diff --git a/src/main/java/org/moeaframework/benchmarks/WDS/WDS.java b/src/main/java/org/moeaframework/benchmarks/WDS/WDS.java
diff --git a/src/main/java/org/moeaframework/benchmarks/WDS/WDSConverter.java b/src/main/java/org/moeaframework/benchmarks/WDS/WDSConverter.java
diff --git a/src/main/java/org/moeaframework/benchmarks/WDS/WDSInstance.java b/src/main/java/org/moeaframework/benchmarks/WDS/WDSInstance.java