From: Steven Luo <steven+maemo@steven676.net>
Date: Sun, 30 May 2010 11:24:53 +0000 (-0700)
Subject: Fix a broken merge
X-Git-Tag: fremantle-package-3.3b1-1fremantle1^0
X-Git-Url: http://git.maemo.org/git/?p=browser-switch;a=commitdiff_plain;h=ae6c9c8e89fccfa6703853a6ecf1f8053a6e9c1d;hp=667d7d137083b1d65c167ee4b29f88361802247c

Fix a broken merge
---

diff --git a/config-ui/browser-switchboard-cp.c b/config-ui/browser-switchboard-cp.c
index b11fd2c..0c768e1 100644
--- a/config-ui/browser-switchboard-cp.c
+++ b/config-ui/browser-switchboard-cp.c
@@ -67,6 +67,7 @@ struct browser_entry browsers[] = {
 	{ "microb", "MicroB (stock browser)" }, /* First entry is the default! */
 	{ "tear", "Tear" },
 	{ "fennec", "Mobile Firefox (Fennec)" },
+	{ "opera", "Opera Mobile" },
 	{ "midori", "Midori" },
 	{ "other", "Other" },
 	{ NULL, NULL },