rpms/bzrtools/F-11 bzrtools.spec,1.45,1.46

[Henrik Nordström]

Author: hno

Update of /cvs/pkgs/rpms/bzrtools/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32413

Modified Files:
	bzrtools.spec 
Log Message:
1.15.0


Index: bzrtools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bzrtools/F-11/bzrtools.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- bzrtools.spec	28 May 2009 08:40:17 -0000	1.45
+++ bzrtools.spec	28 May 2009 08:41:28 -0000	1.46
@@ -5,13 +5,8 @@
 # (bzrlib is arch dependent.  Thus bzrlib plugins are also arch dependent.)
 %define debug_package %{nil}
 
-<<<<<<< bzrtools.spec
 %define bzrver 1.15
 %define bzrnextver 1.16
-=======
-%define bzrver 1.14
-%define bzrnextver 1.16
->>>>>>> 1.44
 
 Name:           bzrtools
 Version:        %{bzrver}.0