From e3d4c1a4c88f824e5a835bad3c0bf4fde911a2a4 Mon Sep 17 00:00:00 2001
From: Simo Sorce <simo@fedoraproject.org>
Date: Mar 26 2009 20:30:14 +0000
Subject: Fix bad conflict merge on my part


---

diff --git a/samba.spec b/samba.spec
index b25f8a7..b63c1bc 100644
--- a/samba.spec
+++ b/samba.spec
@@ -1,6 +1,4 @@
 %define main_release 32
-%define samba_version 3.3.1
-%define main_release 31
 %define samba_version 3.3.2
 %define tdb_version 1.1.2
 %define talloc_version 1.2.0