restore after merge error

aol · Oct 29, 2015 · 19bd08c · 19bd08c
1 parent da7893a
commit 19bd08c
Showing 1 changed file with 3 additions and 15 deletions.
diff --git a/cyclops-invokedynamic/src/main/java/com/aol/cyclops/invokedynamic/ExceptionSoftener.java b/cyclops-invokedynamic/src/main/java/com/aol/cyclops/invokedynamic/ExceptionSoftener.java
@@ -1,22 +1,11 @@
 package com.aol.cyclops.invokedynamic;
 
-import java.io.IOException;
 
 import lombok.experimental.UtilityClass;
 
 @UtilityClass
 public class ExceptionSoftener {
 
-<<<<<<< HEAD
-	public static <T extends Throwable,R> R throwSoftenedException(final T e) {
-		uncheck(e);
-		return null;
-	}
-
-	private static <T extends Throwable> void uncheck(Throwable throwable) throws T {
-		throw (T) throwable;
-
-=======
 
 
 
@@ -27,11 +16,10 @@ public static RuntimeException throwSoftenedException(final Throwable e) {
 	@SuppressWarnings("unchecked")
 	private static <T extends Throwable> T uncheck(Throwable throwable) throws T {
 		throw (T) throwable;
->>>>>>> 541bfbd5f5ab031ffed5125fc0061194c124f340
 	}
+
+
 
-	public static Integer myTest(){
-		return throwSoftenedException(new IOException());
-	}
 
 }
+