--- rpl/src/bibliotheque_trigonometrique.f	2011/04/21 16:00:53	1.18
+++ rpl/src/bibliotheque_trigonometrique.f	2011/06/10 11:35:12	1.19
@@ -16,27 +16,6 @@ C
 C You should have received a copy of the CeCILL License
 C along with RPL/2. If not, write to info@cecill.info.
 C===============================================================================
-<<<<<<< bibliotheque_trigonometrique.f
-C RPL/2 (R) version 4.1.0.prerelease.0
-=======
-C RPL/2 (R) version 4.0.23
->>>>>>> 1.15.2.2
-C Copyright (C) 1989-2011 Dr. BERTRAND Joël
-C
-C This file is part of RPL/2.
-C
-C RPL/2 is free software; you can redistribute it and/or modify it
-C under the terms of the CeCILL V2 License as published by the french
-C CEA, CNRS and INRIA.
-C
-C RPL/2 is distributed in the hope that it will be useful, but WITHOUT
-C ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-C FITNESS FOR A PARTICULAR PURPOSE.  See the CeCILL V2 License
-C for more details.
-C
-C You should have received a copy of the CeCILL License
-C along with RPL/2. If not, write to info@cecill.info.
-C===============================================================================
 
 
 C===============================================================================