--- PamelaLevel2/doc/cernlib_pam	2008/12/04 15:34:25	1.3
+++ PamelaLevel2/doc/cernlib_pam	2008/12/05 08:34:02	1.4
@@ -1,7 +1,11 @@
 #!/bin/sh
 # **********************************************************************
 # * @(#) cernlib
+<<<<<<< cernlib_pam
 # * @(#) $Header: /afs/ba.infn.it/user/pamela/src/CVS/PamelaLevel2/doc/cernlib_pam,v 1.2 2007/01/24 09:07:49 mocchiut Exp $
+=======
+# * @(#) $Header: /afs/ba.infn.it/user/pamela/src/CVS/PamelaLevel2/doc/cernlib_pam,v 1.3 2008-12-04 15:34:25 pam-fi Exp $
+>>>>>>> 1.3
 # *                                                                    *
 # * Attachment of CERN Libraries for link step                         *
 # *                                                                    *