SPECS: linux-atm.spec - resolved conflict

[qboosh]

Author: qboosh                       Date: Wed Feb 14 21:44:01 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- resolved conflict

---- Files affected:
SPECS:
   linux-atm.spec (1.39 -> 1.40) 

---- Diffs:

================================================================
Index: SPECS/linux-atm.spec
diff -u SPECS/linux-atm.spec:1.39 SPECS/linux-atm.spec:1.40
--- SPECS/linux-atm.spec:1.39	Tue Feb 13 07:46:52 2007
+++ SPECS/linux-atm.spec	Wed Feb 14 22:43:56 2007
@@ -45,15 +45,7 @@
 Patch3:		ftp://ftp.cmf.nrl.navy.mil/pub/chas/linux-atm/vbr/vbr-%{name}-diffs
 Patch4:		%{name}-llh-vbr.patch
 Patch5:		%{name}-gcc4.patch
-<<<<<<< linux-atm.spec
-<<<<<<< linux-atm.spec
-Patch6:		%{name}-stdlib.patch
-Icon:		linux-atm-logo.gif
-=======
->>>>>>> 1.34
-=======
 Patch6:		%{name}-LDFLAGS.patch
->>>>>>> 1.37
 URL:		http://linux-atm.sourceforge.net/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -229,6 +221,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.40  2007/02/14 21:43:56  qboosh
+- resolved conflict
+
 Revision 1.39  2007/02/13 06:46:52  glen
 - tabs in preamble
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/linux-atm.spec?r1=1.39&r2=1.40&f=u