[R-ROC/f14] Fix sources

[Pierre-YvesChibon]

commit 8a42093d8aa59f004585fe65188226647bd51424
Author: pingou <pingou at pingoured.fr>
Date:   Thu Jun 23 20:56:35 2011 +0200

    Fix sources

 sources |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)
---
diff --git a/sources b/sources
index b138032..164d5e8 100644
--- a/sources
+++ b/sources
@@ -1,5 +1 @@
-<<<<<<< HEAD
-1fcb78c8a2d53c58773534f906cc5f42  ROC_1.24.1.tar.gz
-=======
 5eaeca1d3f10c4d7b80fb60dabc50dfc  ROC_1.28.0.tar.gz
->>>>>>> 94a8a8f... Update to 1.28.0