From: Arkadiusz Miśkiewicz <arekm@maven.pl>
Date: Thu, 29 Nov 2007 08:01:25 +0000 (+0000)
Subject: - rel 10
X-Git-Tag: auto/ac/lighttpd-1_4_18-11~18
X-Git-Url: https://git.pld-linux.org/?a=commitdiff_plain;h=ff5d8627f35c55b9b18354905e9530a55d345abd;p=packages%2Flighttpd.git

- rel 10

Changed files:
    lighttpd.spec -> 1.238
---

diff --git a/lighttpd.spec b/lighttpd.spec
index b2d237e..a2bb27e 100644
--- a/lighttpd.spec
+++ b/lighttpd.spec
@@ -37,7 +37,11 @@
 %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