Re: stray conflict marker on ARM docs

2025-06-23 Thread 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 s

Re: stray conflict marker on ARM docs

2025-06-23 Thread Petr Špaček
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` a