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 /src/core/lombok/extern/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 'src/core/lombok/extern/java')
| -rw-r--r-- | src/core/lombok/extern/java/Log.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/lombok/extern/java/Log.java b/src/core/lombok/extern/java/Log.java index 90c62956..7ae4e07b 100644 --- a/src/core/lombok/extern/java/Log.java +++ b/src/core/lombok/extern/java/Log.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010-2012 The Project Lombok Authors. + * Copyright (C) 2010-2013 The Project Lombok Authors. * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -51,6 +51,7 @@ import java.lang.annotation.Target; * @see java.util.logging.Logger#getLogger(java.lang.String) java.util.logging.Logger.getLogger(String name) * @see lombok.extern.apachecommons.CommonsLog @CommonsLog * @see lombok.extern.log4j.Log4j @Log4j + * @see lombok.extern.log4j.Log4j2 @Log4j2 * @see lombok.extern.slf4j.Slf4j @Slf4j * @see lombok.extern.slf4j.XSlf4j @XSlf4j */ |