[FFmpeg-devel] [PATCH] gitattributes: End merge conflicts in Changelog

[Michael Niedermayer]

On Fri, Mar 14, 2025 at 03:30:46PM +0100, Michael Niedermayer wrote:
> Similar could be done with other lists that generally are appended to
> 
> Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> ---
>  .gitattributes | 1 +
>  1 file changed, 1 insertion(+)

will apply


[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

While the State exists there can be no freedom; when there is freedom there
will be no State. -- Vladimir Lenin
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 195 bytes
Desc: not available
URL: <https://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20250317/212c631d/attachment.sig>