Fix merge errors post 8.3.0

[tools/medcoupling.git] / src / INTERP_KERNEL / PointLocator2DIntersector.txx

diff --git a/src/INTERP_KERNEL/PointLocator2DIntersector.txx b/src/INTERP_KERNEL/PointLocator2DIntersector.txx
index 0f83435c61b41dd67ee77e4b6b056fa381d6e996..eb5044227ec9c8cc5fbfd407487c7fa63953ca41 100644 (file)
--- a/src/INTERP_KERNEL/PointLocator2DIntersector.txx
+++ b/src/INTERP_KERNEL/PointLocator2DIntersector.txx
@@ -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