Logoj0ke.net Open Build Service > Projects > internetx:projects:http > nginx > Changes
Sign Up | Log In

Changes of Revision 237

[-] Changed nginx.spec
x
 
1
@@ -44,11 +44,7 @@
2
 BuildRequires:      gd-devel
3
 BuildRequires:     GeoIP-devel
4
 BuildRequires:     libatomic_ops-devel 
5
-<<<<<<< ./nginx.spec.mine
6
 BuildRequires:     openldap-devel
7
-=======
8
-BuildRequires:      openldap-devel
9
->>>>>>> ./nginx.spec.r230
10
 
11
 Requires:           pcre
12
 Requires:      zlib
13