rpms/socat/devel socat.spec,1.12,1.13

[Paul Wouters]

Author: pwouters

Update of /cvs/extras/rpms/socat/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26962

Modified Files:
	socat.spec 
Log Message:
fix cvs anomaly



Index: socat.spec
===================================================================
RCS file: /cvs/extras/rpms/socat/devel/socat.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- socat.spec	21 Jan 2009 03:31:55 -0000	1.12
+++ socat.spec	21 Jan 2009 03:33:00 -0000	1.13
@@ -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