rpms/samba/devel samba.spec,1.178,1.179

[Simo Sorce]

Author: simo

Update of /cvs/pkgs/rpms/samba/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5990

Modified Files:
	samba.spec 
Log Message:
Fix bad conflict merge on my part



Index: samba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/samba/devel/samba.spec,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -r1.178 -r1.179
--- samba.spec	26 Mar 2009 20:26:58 -0000	1.178
+++ samba.spec	26 Mar 2009 20:30:14 -0000	1.179
@@ -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