- rel 10

Changed files:
    lighttpd.spec -> 1.238

diff --git a/lighttpd.spec b/lighttpd.spec
index b2d237e7facf0810bfee8eb81cd511a73f5bf729..a2bb27eed03221facb753e0656f3160118c64d7e 100644 (file)
--- 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