trial classloader

2011-10-28 11:15:02 -05:00 · 2011-10-28 11:15:02 -05:00 · 062ccd7e70
parent 148459bc8f
commit 062ccd7e70
1 changed files with 0 additions and 4 deletions
--- a/jetty-util/src/main/java/org/eclipse/jetty/util/log/Slf4jLog.java
+++ b/jetty-util/src/main/java/org/eclipse/jetty/util/log/Slf4jLog.java
@ -37,11 +37,7 @@ public class Slf4jLog implements Logger
        }
        catch (ClassNotFoundException ex)
        {
-<<<<<<< Updated upstream
            ex.printStackTrace(System.err);
-=======
-            ex.printStackTrace();
->>>>>>> Stashed changes
            throw new NoClassDefFoundError("org.slf4j.impl.StaticLoggerBinder");
        }