fix conflict

[tools/medcoupling.git] / src / MEDLoader / MEDFileBasis.cxx

diff --git a/src/MEDLoader/MEDFileBasis.cxx b/src/MEDLoader/MEDFileBasis.cxx
index bb082312e6d24aaee0217359980dfe52f3bca106..8e61dfb0edc146a0e98f5f7f87dffe4ad654417d 100644 (file)
--- a/src/MEDLoader/MEDFileBasis.cxx
+++ b/src/MEDLoader/MEDFileBasis.cxx
@@ -1,9 +1,9 @@
-// Copyright (C) 2007-2013  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
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -34,7 +34,7 @@ MEDFileString::~MEDFileString()
   delete [] _content;
 }
 
-void MEDFileString::set(const char *s) throw(INTERP_KERNEL::Exception)
+void MEDFileString::set(const char *s)
 {
   if((int)strlen(s)>_max_lgth)
     throw INTERP_KERNEL::Exception("Name is too long to be stored in MEDfile !");