merge conflict

[modules/med.git] / src / MEDCalculator / MEDCalculatorDBRangeSelection.cxx

diff --git a/src/MEDCalculator/MEDCalculatorDBRangeSelection.cxx b/src/MEDCalculator/MEDCalculatorDBRangeSelection.cxx
index d6fb348a9f645d88fd217af06ee88f846c813205..21f17add81c11a6772cc7ed60e6fb6ad2df054c3 100644 (file)
--- a/src/MEDCalculator/MEDCalculatorDBRangeSelection.cxx
+++ b/src/MEDCalculator/MEDCalculatorDBRangeSelection.cxx
@@ -1,9 +1,9 @@
-// Copyright (C) 2007-2013  CEA/DEN, EDF R&D
+// Copyright (C) 2007-2015  CEA/DEN, EDF R&D
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of