fix conflict

[tools/medcoupling.git] / src / MEDLoader / MEDFileData.hxx

diff --git a/src/MEDLoader/MEDFileData.hxx b/src/MEDLoader/MEDFileData.hxx
index 38e3a5b765d700dfa7d77c0e1b3bb9d2c22922aa..ce7a2ea3621a70908441c3a83b6110a978de0ae6 100644 (file)
--- a/src/MEDLoader/MEDFileData.hxx
+++ b/src/MEDLoader/MEDFileData.hxx
@@ -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