fix ver-rel cvs conflict

This commit is contained in:
Jens Petersen 2006-02-10 02:54:37 +00:00
parent cf04f18aaa
commit 1550445550

View File

@ -4,13 +4,8 @@
%define with_examples 0 %define with_examples 0
Name: m17n-lib Name: m17n-lib
<<<<<<< m17n-lib.spec
Version: 1.3.2 Version: 1.3.2
Release: 1%{?dist} Release: 1%{?dist}
=======
Version: 1.3.1
Release: 1%{?dist}.1
>>>>>>> 1.4
Summary: Multilingual text library Summary: Multilingual text library
Group: System Environment/Libraries Group: System Environment/Libraries