summaryrefslogtreecommitdiff
path: root/xmerge/java/org/openoffice/xmerge/merger/MergeAlgorithm.java
diff options
context:
space:
mode:
Diffstat (limited to 'xmerge/java/org/openoffice/xmerge/merger/MergeAlgorithm.java')
-rw-r--r--xmerge/java/org/openoffice/xmerge/merger/MergeAlgorithm.java5
1 files changed, 1 insertions, 4 deletions
diff --git a/xmerge/java/org/openoffice/xmerge/merger/MergeAlgorithm.java b/xmerge/java/org/openoffice/xmerge/merger/MergeAlgorithm.java
index c21aac35bd9c..3ee7ba7ad6c1 100644
--- a/xmerge/java/org/openoffice/xmerge/merger/MergeAlgorithm.java
+++ b/xmerge/java/org/openoffice/xmerge/merger/MergeAlgorithm.java
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: MergeAlgorithm.java,v $
- * $Revision: 1.3 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify