Skip to content

Commit

Permalink
fix merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
jburel committed May 1, 2023
1 parent 048e826 commit 85ab308
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ def read(fname):
"omero-marshal>=0.7.0",
"Pillow",
"portalocker",
"pytz",
],
include_package_data=True,
tests_require=["pytest"],
Expand Down

0 comments on commit 85ab308

Please sign in to comment.