From ac735c9a34d0032fa55377b84c2f92a8d4785e17 Mon Sep 17 00:00:00 2001
From: Damien Elmes <git@ichi2.net>
Date: Wed, 21 Jul 2010 20:25:39 +0900
Subject: [PATCH] tweak formatting

---
 ankiqt/ui/main.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ankiqt/ui/main.py b/ankiqt/ui/main.py
index 908abffc8..4b77eb11c 100755
--- a/ankiqt/ui/main.py
+++ b/ankiqt/ui/main.py
@@ -2194,8 +2194,9 @@ it to your friends.
 
     def onConflict(self, deckName):
         diag = ui.utils.askUserDialog(_("""\
-<b>%s</b> has been changed on both the local<br>
-and remote side. What do you want to do?""" % deckName),
+<b>%s</b> has been changed on both
+the local and remote side. What do
+you want to do?""" % deckName),
                           [_("Keep Local"),
                            _("Keep Remote"),
                            _("Cancel")])