diff options
| author | Mat Booth | 2020-04-11 08:39:15 +0000 |
|---|---|---|
| committer | Mat Booth | 2020-04-11 09:35:26 +0000 |
| commit | 20b6b4f6ef95e4e185b7f2ba6b2aee59044337f1 (patch) | |
| tree | 98cc8cbff0619c239a9c8f517ae1f8cbff409bee | |
| parent | 559aae6dc64f5c2e636de4bcf21f0c477f1ee193 (diff) | |
| download | eclipse.platform.team-20b6b4f6ef95e4e185b7f2ba6b2aee59044337f1.tar.gz eclipse.platform.team-20b6b4f6ef95e4e185b7f2ba6b2aee59044337f1.tar.xz eclipse.platform.team-20b6b4f6ef95e4e185b7f2ba6b2aee59044337f1.zip | |
Bug 562013 - Botched patch merge in license headerI20200411-1800I20200411-0950I20200411-0720
Fix incorrect merge done in change 91927cb3b3
Change-Id: Id982a3fa7d3984c66ebc291241e68a93c4e4fa89
Signed-off-by: Mat Booth <mat.booth@redhat.com>
2 files changed, 3 insertions, 8 deletions
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareContentViewerSwitchingPane.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareContentViewerSwitchingPane.java index c0fe6851b..684f1d542 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareContentViewerSwitchingPane.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareContentViewerSwitchingPane.java @@ -1,7 +1,8 @@ /******************************************************************************* * Copyright (c) 2009, 2017 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/Utilities.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/Utilities.java index 20cfc357a..7a8f91c20 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/Utilities.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/Utilities.java @@ -1,14 +1,8 @@ /******************************************************************************* -<<<<<<< HEAD * Copyright (c) 2000, 2017 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 -======= - * Copyright (c) 2000, 2016 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 ->>>>>>> Bug 473847 - Support DialogCompare for pure E4 applications * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * |