SPECS: dhcpcd.spec - resolved conflict

[qboosh]

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

---- Files affected:
SPECS:
   dhcpcd.spec (1.72 -> 1.73) 

---- Diffs:

================================================================
Index: SPECS/dhcpcd.spec
diff -u SPECS/dhcpcd.spec:1.72 SPECS/dhcpcd.spec:1.73
--- SPECS/dhcpcd.spec:1.72	Mon Feb 12 22:23:52 2007
+++ SPECS/dhcpcd.spec	Wed Feb 14 22:40:02 2007
@@ -89,12 +89,8 @@
 
 %prep
 %setup -q
-<<<<<<< dhcpcd.spec
-%patch0 -p0
-%patch1 -p1
-=======
 %patch0 -p1
->>>>>>> 1.70
+%patch1 -p1
 
 %build
 %{__make} \
@@ -129,6 +125,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.73  2007/02/14 21:40:02  qboosh
+- resolved conflict
+
 Revision 1.72  2007/02/12 21:23:52  glen
 - tabs in preamble
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/dhcpcd.spec?r1=1.72&r2=1.73&f=u