Changes - j0ke.net Open Build Service

[-] [+]	Changed	nginx.spec
@@ -187,8 +187,12 @@ --with-http_slice_module \ --with-stream_ssl_preread_module \ --with-http_sub_module \ +<<<<<<< .mine --add-module=%{_builddir}/nginx-%{version}/ngx_http_substitutions_filter_module-master \ --with-debug \ +======= + --add-module=%{_builddir}/nginx-%{version}/ngx_http_substitutions_filter_module-master \ +>>>>>>> .new %if 0%{?with_ldap_auth} == 1 --add-module=%{_builddir}/nginx-%{version}/nginx-auth-ldap \ %endif
[-] [+]	Changed	_link ^
@@ -1,4 +1,4 @@ -<link project="home:kries:proceed" package="nginx" baserev="7590f3e52da30485ef7e4d7f1068bd43"> +<link project="home:kries:proceed" package="nginx" baserev="e26b02861e7f0643e7e30703372a5f8c"> <patches> <branch/> </patches>