Skip to content

Commit

Permalink
fix conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
Al Niessner authored and Al Niessner committed Jan 24, 2020
2 parents 22744b0 + 8503991 commit b82effa
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion Python/dawgie/db/shelf.py
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ class Func(enum.IntEnum):

class Interface(Connector,dawgie.Aspect,dawgie.Dataset,dawgie.Timeline):
def __iter__(self):
for kv in self.__span.items: yield kv
for kv in self.__span.items(): yield kv
return

# pylint: disable=too-many-arguments
Expand Down

0 comments on commit b82effa

Please sign in to comment.