Author: chatellier Date: 2011-07-06 14:45:55 +0000 (Wed, 06 Jul 2011) New Revision: 3434 Log: Fix header and license Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2011-07-06 14:45:10 UTC (rev 3433) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2011-07-06 14:45:55 UTC (rev 3434) @@ -2,27 +2,15 @@ * #%L * IsisFish * -<<<<<<< .courant * $Id$ * $HeadURL$ * %% - * Copyright (C) 2002 - 2010 Ifremer, Code Lutin, Benjamin Poussin + * Copyright (C) 2002 - 2011 Ifremer, Code Lutin, Benjamin Poussin, Chatellier Eric * %% * This program 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. -======= - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2002 - 2011 Ifremer, Code Lutin, Benjamin Poussin, CHatellier Eric - * %% - * This program 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. ->>>>>>> .fusion-droit.r3392 * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -57,7 +45,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.ApplicationConfig; -import org.nuiton.util.ArgumentsParserException; import org.nuiton.util.StringUtil; import org.nuiton.util.Version;