header fix

emacthecav · emacthecav · commit 36e476ee8f5c · 2018-07-06T15:15:50.000-04:00
diff --git a/core/store/src/main/java/mil/nga/giat/geowave/core/store/base/BaseDataStoreUtils.java b/core/store/src/main/java/mil/nga/giat/geowave/core/store/base/BaseDataStoreUtils.java
@@ -75,12 +75,7 @@ public static <T> GeoWaveRow[] getGeoWaveRows(
 	 * and HBase; Unification in progress
 	 *
 	 * Override this method if you can't pass in a GeoWaveRow!
-<<<<<<< HEAD
-	 * 
-	 * @throws AdapterException
-=======
 	 * @throws AdapterException 
->>>>>>> ee65ef8db355dff0f41060c1badd81a097b325bc
 	 */
 	public static <T> Object decodeRow(
 			final GeoWaveRow geowaveRow,
