fix conflict

[tools/medcoupling.git] / src / MEDLoader / MEDFileBasis.cxx

diff --git a/src/MEDLoader/MEDFileBasis.cxx b/src/MEDLoader/MEDFileBasis.cxx
index a9a5696b459ecbe3b97e90ee8b0bad4cced586a9..8e61dfb0edc146a0e98f5f7f87dffe4ad654417d 100644 (file)
--- a/src/MEDLoader/MEDFileBasis.cxx
+++ b/src/MEDLoader/MEDFileBasis.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