From 226a5f35cd2eee3aa24a7daf6f20681f04f8d211 Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Tue, 8 Aug 2023 11:22:51 +0200 Subject: JCPP: Resolve another merge conflict --- src/main/java/com/jogamp/gluegen/jcpp/MacroTokenSource.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/com/jogamp/gluegen/jcpp/MacroTokenSource.java b/src/main/java/com/jogamp/gluegen/jcpp/MacroTokenSource.java index 18839c1..ec4bea6 100644 --- a/src/main/java/com/jogamp/gluegen/jcpp/MacroTokenSource.java +++ b/src/main/java/com/jogamp/gluegen/jcpp/MacroTokenSource.java @@ -29,7 +29,6 @@ import static com.jogamp.gluegen.jcpp.Token.*; * in any inactive context. */ /* pp */ class MacroTokenSource extends Source { - private static final Logger LOG = LoggerFactory.getLogger(MacroTokenSource.class); private final Macro macro; private final Iterator tokens; /* Pointer into the macro. */ -- cgit v1.2.3