Index: chrome/app/generated_resources.grd |
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd |
index 9139dcadde02e8b69c636fe30ba148e94f2139d1..a5cfddc537923c533b8d1c9effe45051a0be742e 100644 |
--- a/chrome/app/generated_resources.grd |
+++ b/chrome/app/generated_resources.grd |
@@ -5497,12 +5497,6 @@ Keep your key file in a safe place. You will need it to create new versions of y |
<message name="IDS_FLAGS_DISABLE_COMPOSITOR_TOUCH_HIT_TESTING_DESCRIPTION" desc="Description of the disable compositor touch hit testing flags."> |
Disables an optimization intended to improve touch scrolling responsiveness. Forces all touch events to go to the blink main thread to look for handlers, instead of potentially short-circuiting from the compositor thread. |
</message> |
- <message name="IDS_FLAGS_CONFLICTS_CHECK_NAME" desc="Title of the run conflicts check flag"> |
- Check for known conflicts with 3rd party modules. |
- </message> |
- <message name="IDS_FLAGS_CONFLICTS_CHECK_DESCRIPTION" desc="Description of the conflicts check flag"> |
- Enables a background check that warns you when a software incompatibility is detected (ie. 3rd party modules that crash the browser). |
- </message> |
<message name="IDS_FLAGS_COMPOSITED_LAYER_BORDERS" desc="Name of the 'Composited layer borders' lab."> |
Composited render layer borders |
</message> |