From a0d910201d5a20490c7fe66b1ed7901f46ebf6aa Mon Sep 17 00:00:00 2001
From: Damien Elmes <git@ichi2.net>
Date: Fri, 2 Dec 2011 17:37:10 +0900
Subject: [PATCH] don't add two typeans fields on upgrade

---
 anki/upgrade.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/anki/upgrade.py b/anki/upgrade.py
index 718a0fbd7..d644523f1 100644
--- a/anki/upgrade.py
+++ b/anki/upgrade.py
@@ -406,7 +406,8 @@ order by ordinal""", mid)):
                     "(?i){{modelTags}}", "{{Model}}", conf[type])
                 # type answer is now embedded in the format
                 if typeAns:
-                    conf[type] += '<br>{{type:%s}}' % typeAns
+                    if type == "qfmt" or hideq:
+                        conf[type] += '<br>{{type:%s}}' % typeAns
             # q fields now in a
             if not hideq:
                 conf['afmt'] = (