From d0f1a12baa91e6e42c7983a69420a7e908d4e564 Mon Sep 17 00:00:00 2001
From: Peter van 't Hof <p.j.van_t_hof@lumc.nl>
Date: Tue, 4 Nov 2014 09:29:34 +0100
Subject: [PATCH] Resolve name conflict
---
.../main/scala/nl/lumc/sasc/biopet/core/PipelineCommand.scala | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/core/PipelineCommand.scala b/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/core/PipelineCommand.scala
index 52fff1465..6a245cdfd 100644
--- a/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/core/PipelineCommand.scala
+++ b/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/core/PipelineCommand.scala
@@ -1,8 +1,8 @@
package nl.lumc.sasc.biopet.core
-import org.broadinstitute.gatk.queue.util.Logging
+import org.broadinstitute.gatk.queue.util.{ Logging => GatkLogging }
-trait PipelineCommand extends MainCommand with Logging {
+trait PipelineCommand extends MainCommand with GatkLogging {
def pipeline = "/" + getClass.getName.stripSuffix("$").replaceAll("\\.", "/") + ".class"
--
GitLab