Skip to content

Commit

Permalink
resolve conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
@yalinli2
yalinli2 committed Dec 10, 2024
1 parent 90c4f67 commit 557cade
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions requirements.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,10 @@ SALib>=1.4.5
seaborn
sympy>=1.8
matplotlib<=3.6.0
<<<<<<< Updated upstream
# numpy<2.0.0
=======
>>>>>>> Stashed changes

# Specifically for docs
sphinx
Expand Down

0 comments on commit 557cade

Please sign in to comment.