Fix merge errors post 8.3.0

[tools/medcoupling.git] / src / INTERP_KERNEL / TransformedTriangleIntersect.cxx

diff --git a/src/INTERP_KERNEL/TransformedTriangleIntersect.cxx b/src/INTERP_KERNEL/TransformedTriangleIntersect.cxx
index fa4c8a53581e8b5498cd5766f531a38ea0964b78..ea296249e46fc966b99d0f981223a1e4f41a9256 100644 (file)
--- a/src/INTERP_KERNEL/TransformedTriangleIntersect.cxx
+++ b/src/INTERP_KERNEL/TransformedTriangleIntersect.cxx
@@ -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