[ioprocess: 3/3] v0.14.0

[smizrahi]

commit 4c82bbec3bf6c4c03cf49d0b4cb0578e4de00445
Author: Saggi Mizrahi <ficoos at gmail.com>
Date:   Mon Oct 20 17:00:34 2014 +0300

    v0.14.0

 ioprocess.spec |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)
---
diff --git a/ioprocess.spec b/ioprocess.spec
index 9a6461d..6833dba 100644
--- a/ioprocess.spec
+++ b/ioprocess.spec
@@ -6,13 +6,8 @@
 %endif
 
 Name:		ioprocess
-<<<<<<< HEAD
 Version:	0.14.0
 Release:	1%{?dist}
-=======
-Version:	0.12.0
-Release:	2%{?dist}
->>>>>>> 4b8f48ce5eb2e9459f076bb22b79d958882c2773
 Summary:	Slave process to perform risky IO
 
 Group:		System Environment/Base