SPECS: lighttpd.spec - ups, revert

[arekm]

Author: arekm                        Date: Thu Nov 29 08:03:40 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- ups, revert

---- Files affected:
SPECS:
   lighttpd.spec (1.238 -> 1.239) 

---- Diffs:

================================================================
Index: SPECS/lighttpd.spec
diff -u SPECS/lighttpd.spec:1.238 SPECS/lighttpd.spec:1.239
--- SPECS/lighttpd.spec:1.238	Thu Nov 29 09:01:25 2007
+++ SPECS/lighttpd.spec	Thu Nov 29 09:03:35 2007
@@ -38,11 +38,7 @@
 %define		webdav_progs	1
 %endif
 
-<<<<<<< lighttpd.spec
-%define		_rel 7
-=======
 %define		_rel 9
->>>>>>> 1.237
 Summary:	Fast and light HTTP server
 Summary(pl.UTF-8):	Szybki i lekki serwer HTTP
 Name:		lighttpd
@@ -1255,6 +1251,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.239  2007-11-29 08:03:35  arekm
+- ups, revert
+
 Revision 1.238  2007-11-29 08:01:25  arekm
 - rel 10
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/lighttpd.spec?r1=1.238&r2=1.239&f=u