Re: stray conflict marker on ARM docs
Petr Špaček <[email protected]>
| Newsgroups | gmane.network.dns.bind9.user |
|---|---|
| Message-ID | <7b4c03e5-5145-44aa-99a1-32cf80be6025__32759.8698715278$1750674752$gmane$org@isc.org> |
On 23. 06. 25 12:23, Bagas Sanjaya wrote: > Hi Aydın, > > When I look at ARM docs (`doc/arm/build.inc.rst`) since your Meson > build conversion in 5cd6c173ff74 (replace the build system with meson, 2024-04-16), > I see stray conflict marker remains: > >> <<<<<<< HEAD >> For line editing in :iscman:`nsupdate` and :iscman:`nslookup`, >> the ``libedit`` library (https://www.thrysoee.dk/editline/) must be >> installed. If these are installed at a nonstandard location, adjust >> ``PKG_CONFIG_PATH`` or use the option ``--pkg-config-path``. > > Would you like to clean it up? Thank for the report. This was already fixed by 092a31caed7c05baaddea119527670168dab5f81. You are looking at an old version ;-) -- Petr Špaček Internet Systems Consortium -- Visit https://lists.isc.org/mailman/listinfo/bind-users to unsubscribe from this list ISC funds the development of this software with paid support subscriptions. Contact us at https://www.isc.org/contact/ for more information. bind-users mailing list [email protected] https://lists.isc.org/mailman/listinfo/bind-users