Fix merge errors post 8.3.0

[tools/medcoupling.git] / src / INTERP_KERNELTest / MeshTestToolkit.hxx

diff --git a/src/INTERP_KERNELTest/MeshTestToolkit.hxx b/src/INTERP_KERNELTest/MeshTestToolkit.hxx
index 8153d9ba8db65c2097dfd22d900d699dc89943fb..b97dcad07e4d41d88e213636d388bdafbb7b0c1e 100644 (file)
--- a/src/INTERP_KERNELTest/MeshTestToolkit.hxx
+++ b/src/INTERP_KERNELTest/MeshTestToolkit.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2015  CEA/DEN, EDF R&D
+// Copyright (C) 2007-2016  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