93 +<<<<<<< TREE 94 var download_action = new Unity.PreviewAction ("download_album", _("Download"), null); 95 if (album.formatted_price != null) 96 download_action.extra_text = album.formatted_price; 97 +======= 98 + GLib.Icon? icon = new GLib.FileIcon (File.new_for_path (Config.DATADIR + "/icons/unity-icon-theme/places/svg/service-u1.svg")); 99 + var download_action = new Unity.PreviewAction ("download_album", _("Download"), icon); 100 +>>>>>>> MERGE-SOURCE
Uh oh :(
« Back to merge proposal
93 +<<<<<<< TREE formatted_ price != null) action. extra_text = album.formatted _price; unity-icon- theme/places/ svg/service- u1.svg" ));
94 var download_action = new Unity.PreviewAction ("download_album", _("Download"), null);
95 if (album.
96 download_
97 +=======
98 + GLib.Icon? icon = new GLib.FileIcon (File.new_for_path (Config.DATADIR + "/icons/
99 + var download_action = new Unity.PreviewAction ("download_album", _("Download"), icon);
100 +>>>>>>> MERGE-SOURCE
Uh oh :(