From 2b4616dd811051daeb3cd926944004826b86b585 Mon Sep 17 00:00:00 2001
From: Paul Wouters <pwouters@fedoraproject.org>
Date: Jan 21 2009 03:33:00 +0000
Subject: fix cvs anomaly


---

diff --git a/socat.spec b/socat.spec
index e90bbe6..f79e5fb 100644
--- a/socat.spec
+++ b/socat.spec
@@ -1,12 +1,7 @@
 Summary: Bidirectional data relay between two data channels ('netcat++')
 Name: socat
-<<<<<<< socat.spec
 Version: 1.7.0.0
 Release: 1%{?dist}
-=======
-Version: 1.6.0.1
-Release: 3%{?dist}
->>>>>>> 1.11
 License: GPLv2
 Url:  http://www.dest-unreach.org/%{name}
 Source: http://www.dest-unreach.org/socat/download/%{name}-%{version}.tar.bz2