diff options
| author | Roel Spilker <r.spilker@gmail.com> | 2013-03-25 20:31:18 +0100 |
|---|---|---|
| committer | Roel Spilker <r.spilker@gmail.com> | 2013-03-25 20:31:18 +0100 |
| commit | f36deeb25f7ff4799b754482c014a413250b33a5 (patch) | |
| tree | cdad5343e429b8a243db02b9e826205099b1d34f /test/transform/resource/after-delombok/LoggerSlf4j.java | |
| parent | d7776a91222c943aeb25cf61444df46fe5cdebfa (diff) | |
| parent | 66f32d5073bc726f76f958471ea93ec5a29c354b (diff) | |
| download | lombok-f36deeb25f7ff4799b754482c014a413250b33a5.tar.gz lombok-f36deeb25f7ff4799b754482c014a413250b33a5.tar.bz2 lombok-f36deeb25f7ff4799b754482c014a413250b33a5.zip | |
Fixed merge conflict in changelog
Diffstat (limited to 'test/transform/resource/after-delombok/LoggerSlf4j.java')
| -rw-r--r-- | test/transform/resource/after-delombok/LoggerSlf4j.java | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/test/transform/resource/after-delombok/LoggerSlf4j.java b/test/transform/resource/after-delombok/LoggerSlf4j.java index cb1486ba..4cc7c107 100644 --- a/test/transform/resource/after-delombok/LoggerSlf4j.java +++ b/test/transform/resource/after-delombok/LoggerSlf4j.java @@ -1,11 +1,9 @@ class LoggerSlf4j { private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4j.class); } - class LoggerSlf4jWithImport { private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jWithImport.class); } - class LoggerSlf4jOuter { static class Inner { private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(Inner.class); |