stray conflict marker on ARM docs

[Bagas Sanjaya]

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