Ayantunji Timilehin 137034105a feat(icons): Add git-merge-conflict icon (#3008) ...

* Add icons/git-merge-conflict-icon

* updated git-merge-conflict.svg and git-merge-conflict.json

* added more contributors to git-merge-conflict.json

---------

Co-authored-by: timmy471 <timilehin.ayantunji@etranzact.com>
Co-authored-by: Eric Fennis <eric.fennis@gmail.com>

2026-02-17 08:45:50 +01:00

352 B

Raw Blame History