fix conflict

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

diff --git a/src/MEDLoader/MEDFileBasis.hxx b/src/MEDLoader/MEDFileBasis.hxx
index 67702e68ef3664b58a8e70dc1bb3c69441adb698..41f40278749575281cd27643704cb11cd5d6e0f5 100644 (file)
--- a/src/MEDLoader/MEDFileBasis.hxx
+++ b/src/MEDLoader/MEDFileBasis.hxx
@@ -1,9 +1,9 @@
-// Copyright (C) 2007-2012  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
@@ -33,7 +33,7 @@ namespace ParaMEDMEM
   public:
     MEDFileString(int maxLgth);
     ~MEDFileString();
-    void set(const char *s) throw(INTERP_KERNEL::Exception);
+    void set(const char *s);
     char *getPointer() { return _content; }
     const char *getReprForWrite() const { return _content; }
     std::string getRepr() const;