From 7ddd5f3614b662582cb9365a7de84fddd27ab78d Mon Sep 17 00:00:00 2001
From: Eugene Budanov <eugene.budanov@rosalab.ru>
Date: Mon, 11 Aug 2014 18:10:31 +0400
Subject: [PATCH] Updated .abf.yml

---
 .abf.yml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/.abf.yml b/.abf.yml
index b67675c..b577b7c 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -2,11 +2,6 @@ removed_sources:
   cherrytree-0.29.tar.xz: 82ca79d89d4310318721fa01315f50d51d1e10f0
   cherrytree-0.30.5.tar.xz: dc10337df026138ceea6546e5af57c699cf7961c
   cherrytree-0.32.0.tar.xz: 91dae6aa3c16d97f42a5188ccab5540032b993e9
-<<<<<<< HEAD
-sources:
-  cherrytree-0.33.4.tar.xz: 0a5fd34324bae637e22b7e96adcc1828e936dd39
-=======
   cherrytree-0.33.4.tar.xz: 0a5fd34324bae637e22b7e96adcc1828e936dd39
 sources:
   cherrytree-0.34.0.tar.xz: 8af9fbd35aa346e70d40d3b58f1795308f5ae4e1
->>>>>>> rosa2012.1