From bf5d30f579f505f85e8f0567d526500e6c3d8d4b Mon Sep 17 00:00:00 2001
From: "oritm@chromium.org"
 <oritm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Wed, 7 Dec 2011 23:42:46 +0000
Subject: Merge 113236 - Replace the Slideshow with the Photo Editor

BUG=chromium-os:23750
TEST=


Review URL: http://codereview.chromium.org/8799006

TBR=kaznacheev@chromium.org
Review URL: http://codereview.chromium.org/8864003

git-svn-id: svn://svn.chromium.org/chrome/branches/963/src@113504 0039d316-1c4b-4281-b951-d872f2087c98
---
 chrome/app/generated_resources.grd | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'chrome/app')

diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 41c9e44..347fa5f 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -4933,11 +4933,6 @@ Keep your key file in a safe place. You will need it to create new versions of y
       <message name="IDS_FLAGS_ENABLE_EXTENSION_ALERTS_DESCRIPTION" desc="Description for the flag to enable extension alerts.">
         Enable various alerts about changes in extension state.
       </message>
-      <message name="IDS_FLAGS_ENABLE_PHOTO_EDITOR_NAME" desc="Title for the flag to enable the photo editor.">
-        Photo Editor
-      </message>
-      <message name="IDS_FLAGS_ENABLE_PHOTO_EDITOR_DESCRIPTION" desc="Description for the flag to enable the photo editor.">
-      </message>
       <message name="IDS_FLAGS_ENABLE_MEDIA_SOURCE_NAME" desc="Title for the flag to enable the Media Source API on &lt;video&gt; elements.">
         Enable Media Source API on &lt;video&gt; elements.
       </message>
-- 
cgit v1.1