mirror of https://github.com/FreeCol/freecol.git
36 lines
1019 B
Java
36 lines
1019 B
Java
/**
|
|
* Copyright (C) 2002-2022 The FreeCol Team
|
|
*
|
|
* This file is part of FreeCol.
|
|
*
|
|
* FreeCol is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation, either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* FreeCol is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with FreeCol. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
package net.sf.freecol.common.i18n;
|
|
|
|
import java.util.List;
|
|
|
|
|
|
public final class Merge {
|
|
|
|
List<String> lineFromFile1;
|
|
|
|
List<String> lineFromFile2;
|
|
|
|
public Merge(List<String> l1, List<String> l2) {
|
|
this.lineFromFile1 = l1;
|
|
this.lineFromFile2 = l2;
|
|
}
|
|
}
|