]> git.pld-linux.org Git - packages/lighttpd.git/commitdiff
projects / packages / lighttpd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ff5d862)
- ups, revert
authorArkadiusz Miśkiewicz <arekm@maven.pl>
Thu, 29 Nov 2007 08:03:35 +0000 (08:03 +0000)
committercvs2git <feedback@pld-linux.org>
Sun, 24 Jun 2012 12:13:13 +0000 (12:13 +0000)
Changed files:
    lighttpd.spec -> 1.239

lighttpd.spec patch | blob | blame | history

diff --git a/lighttpd.spec b/lighttpd.spec
index a2bb27eed03221facb753e0656f3160118c64d7e..b2d237e7facf0810bfee8eb81cd511a73f5bf729 100644 (file)
--- a/lighttpd.spec
+++ b/lighttpd.spec
@@ -37,11 +37,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
Fast and light HTTP server
This page took 0.113152 seconds and 4 git commands to generate.