[R-timeDate/f15] Fix sources

[Pierre-YvesChibon]

commit 1c86f50c91089dafe3fbc1aa331ceeca7ec6cb38
Author: pingou <pingou at pingoured.fr>
Date:   Thu Jun 23 20:53:15 2011 +0200

    Fix sources

 sources |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)
---
diff --git a/sources b/sources
index e1685ee..faadb6a 100644
--- a/sources
+++ b/sources
@@ -1,5 +1 @@
-<<<<<<< HEAD
-e58ddea72b1e09c71ab8d452988a6700  timeDate_2120.90.tar.gz
-=======
 b5d14f7c2c7bd1c813db0201eab75cb4  timeDate_2130.93.tar.gz
->>>>>>> b606e68... Update to 2130.93