[berusky2-data/f16: 5/5] merge fixes

[Martin Stransky]

commit 54628ae20a67b3f15598df98ea7002b04c82d89e
Author: Martin Stransky <stransky at anakreon.cz>
Date:   Sun Mar 4 22:23:23 2012 +0100

    merge fixes

 sources |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)
---
diff --git a/sources b/sources
index 4d1a993..ed9cf33 100644
--- a/sources
+++ b/sources
@@ -1,5 +1 @@
-<<<<<<< HEAD
-e8dac0afd3d185155cee2419b6cc318c  berusky2-data-0.5.tar.gz
-=======
 6072784a2c8bb51a45b6ead703d5264d  berusky2-data-0.6.tar.bz2
->>>>>>> master