rpms/tla/F-7 tla.spec,1.29,1.30

[Debarshi Ray (rishi)]

Author: rishi

Update of /cvs/pkgs/rpms/tla/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20762

Modified Files:
	tla.spec 
Log Message:
Updated to 1.3.5-3 in F-7.

 Modified Files:
 	tla.spec 



Index: tla.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tla/F-7/tla.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- tla.spec	17 Nov 2007 18:44:51 -0000	1.29
+++ tla.spec	17 Nov 2007 18:54:43 -0000	1.30
@@ -1,7 +1,7 @@
 Summary:	A version control system
 Name:		tla
 Version:	1.3.5
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPLv2+
 Group:		Development/Tools
 URL:		http://www.gnu.org/software/gnu-arch/
@@ -99,6 +99,9 @@
 %{_mandir}/man1/%{name}.1.gz
 
 %changelog
+* Sun Nov 18 2007 Debarshi Ray <rishi at fedoraproject.org> - 1.3.5-3
+- Resolved CVS merge conflicts.
+
 * Fri Nov 16 2007 Debarshi Ray <rishi at fedoraproject.org> - 1.3.5-2
 - Changed value of License to GPLv2+.