stray conflict marker on ARM docs
Bagas Sanjaya <[email protected]>
| Newsgroups | gmane.network.dns.bind9.user |
|---|---|
| Message-ID | <aFkrEGhwYbVgN23V__23270.9744757571$1750674219$gmane$org@archie.me> |
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? Thanks. -- An old man doll... just what I always wanted! - Clara -- 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