Salome HOME
projects
/
tools
/
medcoupling.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Fix merge errors post 8.3.0
[tools/medcoupling.git]
/
src
/
INTERP_KERNELTest
/
MeshTestToolkit.txx
diff --git
a/src/INTERP_KERNELTest/MeshTestToolkit.txx
b/src/INTERP_KERNELTest/MeshTestToolkit.txx
index d263cc8a00d748045f2c8e004758f4c88fe54dbb..ff6c9dd6f7a41532db4ffe86040cce9b5a501f38 100644
(file)
--- a/
src/INTERP_KERNELTest/MeshTestToolkit.txx
+++ b/
src/INTERP_KERNELTest/MeshTestToolkit.txx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
5
CEA/DEN, EDF R&D
+// Copyright (C) 2007-201
6
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