From 992e5c3c087c1e28cb1e5f1aa61ead0e4556de18 Mon Sep 17 00:00:00 2001
From: Charles Haley <>
Date: Fri, 24 Sep 2010 08:21:10 +0100
Subject: [PATCH] Repair damage during conflict resolution

---
 src/calibre/utils/formatter.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/utils/formatter.py b/src/calibre/utils/formatter.py
index f1c2a2cb4d..a98f0e7f45 100644
--- a/src/calibre/utils/formatter.py
+++ b/src/calibre/utils/formatter.py
@@ -50,7 +50,7 @@ class TemplateFormatter(string.Formatter):
     format_string_re = re.compile(r'^(.*)\|(.*)\|(.*)$')
     compress_spaces = re.compile(r'\s+')
 
-    def get_value(self, key, args):
+    def get_value(self, key, args, kwargs):
         raise Exception('get_value must be implemented in the subclass')