Commit 57769707 authored by Michael Catanzaro's avatar Michael Catanzaro

Oil my rebase skills

parent 7e96228e
......@@ -101,11 +101,8 @@ static const char * const ephy_prefs_state_schema[] = {
#define EPHY_PREFS_WEB_ENABLE_SITE_SPECIFIC_QUIRKS "enable-site-specific-quirks"
#define EPHY_PREFS_WEB_ENABLE_SAFE_BROWSING "enable-safe-browsing"
#define EPHY_PREFS_WEB_GSB_API_KEY "gsb-api-key"
<<<<<<< HEAD
#define EPHY_PREFS_WEB_DEFAULT_ZOOM_LEVEL "default-zoom-level"
=======
#define EPHY_PREFS_WEB_ENABLE_AUTOSEARCH "enable-autosearch"
>>>>>>> Add setting to disable autosearch
static const char * const ephy_prefs_web_schema[] = {
EPHY_PREFS_WEB_FONT_MIN_SIZE,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment