GNOME Bugzilla – Bug 772031
adwaita-icon-theme: SVG file contains merge conflict markers
Last modified: 2017-01-04 04:23:46 UTC
Bug-Debian: https://bugs.debian.org/838961 The file: Adwaita/scalable/actions/send-to-symbolic.svg has merge conflicts still in it, at line 14. This renders the icon unrenderable (see i.e. the "Open with another application" action on places in gnome-maps). This is a result of commit e562774e7d7a43ca4baaf6af47a2a2fc001f1db6
Created attachment 341613 [details] [review] send-to-symbolic: Resolve the conflict, which was accidentally committed I think we just want the second part - is that right?
*** Bug 773487 has been marked as a duplicate of this bug. ***
Created attachment 341816 [details] [review] symbolic: re-render send-to Re-render send-to to clean up merge conflict grabage.
Attachment 341816 [details] pushed as ec47eef - symbolic: re-render send-to
Hi Jakub, you pushed a fix to the master branch, but afaics, this did not actually affect master, but only the gnome-3-22 branch, where the issue is still there. I'm therefor reopen the bug report. Regards
Just pushed a re-rendering to the branch, hope that's okay (feel free to fix it up if not).
(In reply to Michael Biebl from comment #0) > Bug-Debian: https://bugs.debian.org/838961 > > The file: > Adwaita/scalable/actions/send-to-symbolic.svg > has merge conflicts still in it, at line 14. > This renders the icon unrenderable (see i.e. the "Open with another > application" action > on places in gnome-maps). We should really do a 3.22.1 release for this. The icon is still broken in Maps.