Attempt to merge into lp:~elementary-os/elementaryos/default-settings-trusty failed due to conflicts:
text conflict in debian/elementary-default-settings.gsettings-override
« Back to merge proposal
Attempt to merge into lp:~elementary-os/elementaryos/default-settings-trusty failed due to conflicts:
text conflict in debian/ elementary- default- settings. gsettings- override