fix conflict

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

diff --git a/src/MEDLoader/MEDLoaderBase.cxx b/src/MEDLoader/MEDLoaderBase.cxx
index 0d661aa69e23454aac8e7b607219c92d4470b755..13db3d9d9648a47cd89c35692a845316e0f4dde5 100644 (file)
--- a/src/MEDLoader/MEDLoaderBase.cxx
+++ b/src/MEDLoader/MEDLoaderBase.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