stray conflict marker on ARM docs
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 bind-users@lists.isc.org https://lists.isc.org/mailman/listinfo/bind-users
Re: stray conflict marker on ARM docs
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 bind-users@lists.isc.org https://lists.isc.org/mailman/listinfo/bind-users
Re: stray conflict marker on ARM docs
On Mon, Jun 23, 2025 at 12:32:10PM +0200, Petr Špaček wrote: > 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 > ;-) OK, 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 bind-users@lists.isc.org https://lists.isc.org/mailman/listinfo/bind-users
