merge conflict

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

diff --git a/src/MEDCalculator/MEDCalculatorDBRangeSelection.cxx b/src/MEDCalculator/MEDCalculatorDBRangeSelection.cxx
index d671c98686ee5593173f29e9c3a1db4091a4959e..21f17add81c11a6772cc7ed60e6fb6ad2df054c3 100644 (file)
--- a/src/MEDCalculator/MEDCalculatorDBRangeSelection.cxx
+++ b/src/MEDCalculator/MEDCalculatorDBRangeSelection.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2014  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