mirror of
https://github.com/kovidgoyal/calibre.git
synced 2025-07-09 03:04:10 -04:00
Repair damage during conflict resolution
This commit is contained in:
parent
197e16e62a
commit
992e5c3c08
@ -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')
|
||||
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user