From 0d739adfc806ebd599016dc48490af6107449950 Mon Sep 17 00:00:00 2001
From: Ray Liu <rayliu109@gmail.com>
Date: Wed, 28 Mar 2018 08:26:23 -0400
Subject: [PATCH] Fixed merge errors
---
src/sort/Bound.java | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/sort/Bound.java b/src/sort/Bound.java
index 47b0eea..c71737f 100644
--- a/src/sort/Bound.java
+++ b/src/sort/Bound.java
@@ -1,14 +1,12 @@
-<<<<<<< HEAD
+
package sort;
/**
* Enumeration of bound types.
* @author Christopher W. Schankula
*
*/
-=======
-package sort;
-
->>>>>>> b093c71758057e7a5b83b69a7632a229ad1469bf
+
+
public enum Bound {
LOWER, UPPER, LOWHIGH, ANY, EQUALS;
}
--
GitLab