From ecab169e27ee53e5fbdb3072fd7b8e860b839dce Mon Sep 17 00:00:00 2001 From: =?utf8?q?Stefan=20K=C3=B6gl?= Date: Fri, 12 Apr 2013 21:00:43 +0200 Subject: [PATCH] fix variable name --- mygpo/maintenance/merge.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mygpo/maintenance/merge.py b/mygpo/maintenance/merge.py index 8fa78658..d149a9e1 100644 --- a/mygpo/maintenance/merge.py +++ b/mygpo/maintenance/merge.py @@ -435,7 +435,7 @@ class PodcastStateMerger(object): state.disabled_devices = set_filter(None, state.disabled_devices, state2.disabled_devices) - state.merged_ids = set_filter(state._id, state.merged_ids, + state.merged_ids = set_filter(state1._id, state.merged_ids, [state2._id], state2.merged_ids) state.tags = set_filter(None, state.tags, state2.tags) -- 2.11.4.GIT