From 557cade22cafb91191cb41dab858af5e5b12d973 Mon Sep 17 00:00:00 2001
From: Yalin Li <mailto.yalin.li@gmail.com>
Date: Tue, 10 Dec 2024 17:06:37 -0500
Subject: [PATCH] resolve conflict

---
 requirements.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/requirements.txt b/requirements.txt
index c9e85842..8fa8076c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -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