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/before/LoggerLog4j2.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/before/LoggerLog4j2.java')
-rw-r--r-- | test/transform/resource/before/LoggerLog4j2.java | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/test/transform/resource/before/LoggerLog4j2.java b/test/transform/resource/before/LoggerLog4j2.java new file mode 100644 index 00000000..b7ea99ee --- /dev/null +++ b/test/transform/resource/before/LoggerLog4j2.java @@ -0,0 +1,9 @@ +import lombok.extern.log4j.Log4j2; + +@lombok.extern.log4j.Log4j2 +class LoggerLog4j2 { +} + +@Log4j2 +class LoggerLog4j2WithImport { +}
\ No newline at end of file |