merge a conflict due to a git commit/push/amend/push which confuses git.

Makefile

@@ -202,4 +202,7 @@ amend:
 push:
 	git push git+ssh://jahier@scm.forge.imag.fr/var/lib/gforge/chroot/scmrepos/git/lustre/lus2lic.git
 
+pull:
+	git pull git+ssh://jahier@scm.forge.imag.fr/var/lib/gforge/chroot/scmrepos/git/lustre/lus2lic.git
+
 

src/lic.ml

-(* Time-stamp: <modified the 18/01/2013 (at 09:37) by Erwan Jahier> *)
-
+(* Time-stamp: <modified the 18/01/2013 (at 11:06) by Erwan Jahier> *)
 
 (** Define the Data Structure representing Compiled programs. *)
 

test/lus2lic.sum

-Test Run By jahier on Fri Jan 18 10:57:18 2013
+Test Run By jahier on Fri Jan 18 11:06:23 2013
 Native configuration is i686-pc-linux-gnu
 
 		=== lus2lic tests ===

test/lus2lic.time

-testcase ./lus2lic.tests/non-reg.exp completed in 141 seconds
+testcase ./lus2lic.tests/non-reg.exp completed in 140 seconds
 testcase ./lus2lic.tests/progression.exp completed in 8 seconds