summaryrefslogtreecommitdiff
path: root/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/MergeAlgorithm.java
diff options
context:
space:
mode:
authorJosé Guilherme Vanz <guilherme.sft@gmail.com>2012-09-26 02:23:44 -0300
committerNoel Power <noel.power@suse.com>2012-09-26 09:45:01 +0100
commit4972652eeba3ffa4d5055493d9275cfdc27b247c (patch)
treeaa6841b7109322aaa3a1a21c1e7d7926a39f15f7 /xmerge/source/xmerge/java/org/openoffice/xmerge/merger/MergeAlgorithm.java
parent6595e392eb314b79dec922daf9704569d0c8fff4 (diff)
fdo#51304: Remove @author annotation
This patch removes '@author' annotations and some unnecessary comments in java sources. Change-Id: Icea4721c42dc08fe51a0bc667872dfbca9c2880f Signed-off-by: José Guilherme Vanz <guilherme.sft@gmail.com>
Diffstat (limited to 'xmerge/source/xmerge/java/org/openoffice/xmerge/merger/MergeAlgorithm.java')
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/merger/MergeAlgorithm.java2
1 files changed, 0 insertions, 2 deletions
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/MergeAlgorithm.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/MergeAlgorithm.java
index 3a242dbe5ab5..3e7360a665c3 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/MergeAlgorithm.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/MergeAlgorithm.java
@@ -26,8 +26,6 @@ import org.openoffice.xmerge.merger.Difference;
* This is the <code>MergeAlgorithm</code> interface. It is an
* interface so that different merge algorithms may be plugged-in
* to actually merge the diffs back to an original document.
- *
- * @author smak
*/
public interface MergeAlgorithm {