diff options
| author | Roel Spilker <r.spilker@gmail.com> | 2013-11-19 21:02:59 +0100 |
|---|---|---|
| committer | Roel Spilker <r.spilker@gmail.com> | 2013-11-19 21:02:59 +0100 |
| commit | 78b2d6919e35887940f9f11b6ae1731245739b83 (patch) | |
| tree | 0dc305883c19a862a38669374c5614e26480d4b8 /test/transform/resource/messages-delombok/LoggerSlf4jAlreadyExists.java.messages | |
| parent | 5deb185591904d275cb06eea85c0d739587fc738 (diff) | |
| parent | 83b7e77b0cce6cd5993b17f36164271accdd281c (diff) | |
| download | lombok-78b2d6919e35887940f9f11b6ae1731245739b83.tar.gz lombok-78b2d6919e35887940f9f11b6ae1731245739b83.tar.bz2 lombok-78b2d6919e35887940f9f11b6ae1731245739b83.zip | |
Merge branch 'master' of github.com:rzwitserloot/lombok
Conflicts:
src/delombok/lombok/delombok/DelombokApp.java
Diffstat (limited to 'test/transform/resource/messages-delombok/LoggerSlf4jAlreadyExists.java.messages')
| -rw-r--r-- | test/transform/resource/messages-delombok/LoggerSlf4jAlreadyExists.java.messages | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/transform/resource/messages-delombok/LoggerSlf4jAlreadyExists.java.messages b/test/transform/resource/messages-delombok/LoggerSlf4jAlreadyExists.java.messages index 8aa22226..db5f9891 100644 --- a/test/transform/resource/messages-delombok/LoggerSlf4jAlreadyExists.java.messages +++ b/test/transform/resource/messages-delombok/LoggerSlf4jAlreadyExists.java.messages @@ -1 +1 @@ -1:1 Field 'log' already exists. +1 Field 'log' already exists. |