diff options
Diffstat (limited to 'scripts/combo-layer')
| -rwxr-xr-x | scripts/combo-layer | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/combo-layer b/scripts/combo-layer index e47059290d..52367f091d 100755 --- a/scripts/combo-layer +++ b/scripts/combo-layer @@ -1178,7 +1178,7 @@ def update_with_history(conf, components, revisions, repos): # components imported head revision. if additional_heads: runcmd("git reset --hard", **wargs) - for rev, base in additional_heads.iteritems(): + for rev, base in additional_heads.items(): apply_commit(base, rev, wargs, wargs, None) # Commit with all component branches as parents as well as the previous head. |