> On 27 Jan 2015, at 10:49 pm, Stuart Henderson <st...@openbsd.org> wrote: > > On 2015/01/27 21:54, Ian McWilliam wrote: >> The attached patch moves the share/examples/samba/LDAP/* files >> (mainly schema stuff) from the docs package to the main package. >> >> This was requested some time back by Marcus Merighi so that they >> do not have to install the docs package just for the schema files. >> >> No other functional change. >> >> Ian McWilliam >> >> > > > This change requires conflict markers in order that updates work. >
Hopefully something like the attached with updated conflict markers. Ian McWilliam
samba-3.6.15_ldap_docs_w-conflict_markers.diff
Description: Binary data
