fix cvs anomaly
This commit is contained in:
parent
2cf690cca1
commit
2b4616dd81
@ -1,12 +1,7 @@
|
|||||||
Summary: Bidirectional data relay between two data channels ('netcat++')
|
Summary: Bidirectional data relay between two data channels ('netcat++')
|
||||||
Name: socat
|
Name: socat
|
||||||
<<<<<<< socat.spec
|
|
||||||
Version: 1.7.0.0
|
Version: 1.7.0.0
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}
|
||||||
=======
|
|
||||||
Version: 1.6.0.1
|
|
||||||
Release: 3%{?dist}
|
|
||||||
>>>>>>> 1.11
|
|
||||||
License: GPLv2
|
License: GPLv2
|
||||||
Url: http://www.dest-unreach.org/%{name}
|
Url: http://www.dest-unreach.org/%{name}
|
||||||
Source: http://www.dest-unreach.org/socat/download/%{name}-%{version}.tar.bz2
|
Source: http://www.dest-unreach.org/socat/download/%{name}-%{version}.tar.bz2
|
||||||
|
Loading…
Reference in New Issue
Block a user