Skip to content

Commit

Permalink
fix: reset setup.py to origin/master to resolve conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
@ahuber21
ahuber21 committed Jul 14, 2023
1 parent aaa6cd2 commit faf3f86
Showing 1 changed file with 223 additions and 271 deletions.
Loading

0 comments on commit faf3f86

Please sign in to comment.