summaryrefslogtreecommitdiff
path: root/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/MergeAlgorithm.java
diff options
context:
space:
mode:
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 {