[epiphany] Oil my rebase skills

[Michael Catanzaro <mcatanzaro src gnome org>]

commit 57769707528744e210c71eb3c3ff2c0a1c720a4a
Author: Michael Catanzaro <mcatanzaro igalia com>
Date:   Thu Apr 26 12:59:11 2018 -0500

    Oil my rebase skills

 lib/ephy-prefs.h |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)
---
diff --git a/lib/ephy-prefs.h b/lib/ephy-prefs.h
index 867e46f..20c1de9 100644
--- a/lib/ephy-prefs.h
+++ b/lib/ephy-prefs.h
@@ -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,