Après mon merge héroïque

author emilie <emilie@devijver.org>

Thu, 23 Mar 2017 13:51:41 +0000 (14:51 +0100)

committer emilie <emilie@devijver.org>

Thu, 23 Mar 2017 13:51:41 +0000 (14:51 +0100)
author emilie <emilie@devijver.org>
Thu, 23 Mar 2017 13:51:41 +0000 (14:51 +0100)
committer emilie <emilie@devijver.org>
Thu, 23 Mar 2017 13:51:41 +0000 (14:51 +0100)
diff --cc .gitignore

index d52ee00,d52ee00..b0455d8
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -26,3 -26,3 +26,4 @@@
   #misc
   Rprof.out
   *.zip
++.Rproj.user
diff --cc test/generate_test_data/EMGLLF.R
Simple merge
author	emilie <emilie@devijver.org>
	Thu, 23 Mar 2017 13:51:41 +0000 (14:51 +0100)
committer	emilie <emilie@devijver.org>
	Thu, 23 Mar 2017 13:51:41 +0000 (14:51 +0100)
		1	2
.gitignore	patch \|	diff1 \|	diff2 \|	blob \| history
test/generate_test_data/EMGLLF.R	patch \|	diff1 \|	diff2 \|	blob \| history