Merge lp:~logan/ubuntu-gnome-default-settings/eog-override into lp:ubuntu-gnome-default-settings

[Logan Rosen]

[lp:~logan/ubuntu-gnome-default-settings/eog-override]

32. By Logan Rosen on 2015-05-21

mark as unreleased; my mistake

[Mathieu Trudel-Lapierre (cyphermox)]

Already merged.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2015-03-10 22:19:24 +0000
+++ debian/changelog	2015-05-21 00:17:45 +0000
@@ -1,3 +1,10 @@
+ubuntu-gnome-default-settings (15.04.6) UNRELEASED; urgency=medium
+
+  * Remove external-editor key override, as it no longer exists in eog
+    (LP: #1439220).
+
+ -- Logan Rosen <[e-mail]>  Wed, 20 May 2015 20:03:01 -0400
+
 ubuntu-gnome-default-settings (15.04.5) vivid; urgency=medium
 
   * Add override for locksreen background uri 

=== modified file 'debian/ubuntu-gnome-default-settings.gsettings-override'
--- debian/ubuntu-gnome-default-settings.gsettings-override	2015-03-10 22:19:24 +0000
+++ debian/ubuntu-gnome-default-settings.gsettings-override	2015-05-21 00:17:45 +0000
@@ -44,7 +44,6 @@
 titlebar-font='Cantarell Bold 11'
 
 [org.gnome.eog.ui]
-external-editor='shotwell-viewer.desktop'
 sidebar=false
 
 [org.gnome.Empathy.conversation]