fix merge

This commit is contained in:
j 2010-09-17 17:56:05 +02:00
parent 84ec1f2f2a
commit d85539586b

View file

@ -24,7 +24,7 @@ def main():
sys.exit()
opt = {}
for key in ('oxdb_id', 'imdb_id', 'title', 'director', 'year', 'series', 'frame', 'poster'):
for key in ('oxdb_id', 'imdb_id', 'title', 'director', 'year', 'series', 'frame', 'timeline', 'poster'):
opt[key] = getattr(options, key)
opt['title'] = opt['title'].decode('utf-8')