[R-statmod/f15] Fix sources

[Pierre-YvesChibon]

commit ff957b509599633643ade4997228f6e04efe08e6
Author: pingou <pingou at pingoured.fr>
Date:   Thu Jun 23 20:55:15 2011 +0200

    Fix sources

 sources |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)
---
diff --git a/sources b/sources
index 44a33f3..3f00db8 100644
--- a/sources
+++ b/sources
@@ -1,5 +1 @@
-<<<<<<< HEAD
-84d3719e4a0609ba2e67d2ddddffa3e6  statmod_1.4.6.tar.gz
-=======
 63e58d372f18510acc2e00470c7b0a10  statmod_1.4.10.tar.gz
->>>>>>> 40ef024... Update to 1.4.10