fix conflict

[modules/med.git] / medtool / src / ParaMEDMEM / ParaMESH.cxx

diff --git a/medtool/src/ParaMEDMEM/ParaMESH.cxx b/medtool/src/ParaMEDMEM/ParaMESH.cxx
index a6482a554c87b74317af1f7c7e76c39da7cd5cc9..70b1ffff71ce11eff7b1449c8586195202280b2d 100644 (file)
--- a/medtool/src/ParaMEDMEM/ParaMESH.cxx
+++ b/medtool/src/ParaMEDMEM/ParaMESH.cxx
@@ -1,5 +1,5 @@
-// Copyright (C) 2007-2015  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
 // License as published by the Free Software Foundation; either