From 15504455501c5b9683f679cfeb6cddc3ea795114 Mon Sep 17 00:00:00 2001
From: Jens Petersen <petersen@fedoraproject.org>
Date: Fri, 10 Feb 2006 02:54:37 +0000
Subject: [PATCH] fix ver-rel cvs conflict

---
 m17n-lib.spec | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/m17n-lib.spec b/m17n-lib.spec
index 54c8061..6b4652a 100644
--- a/m17n-lib.spec
+++ b/m17n-lib.spec
@@ -4,13 +4,8 @@
 %define with_examples 0
 
 Name:		m17n-lib
-<<<<<<< m17n-lib.spec
 Version:	1.3.2
 Release:	1%{?dist}
-=======
-Version:	1.3.1
-Release:	1%{?dist}.1
->>>>>>> 1.4
 Summary:	Multilingual text library
 
 Group:		System Environment/Libraries