stray conflict marker on ARM docs

[Bagas Sanjaya]

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