From 8ed9602db8e5255054bd1203e37d2497f4ffea4a Mon Sep 17 00:00:00 2001
From: Beth Shook <es66@rice.edu>
Date: Fri, 21 Feb 2025 11:12:00 -0600
Subject: [PATCH] fix conflict

---
 pytest-selenium/requirements-dev.txt | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/pytest-selenium/requirements-dev.txt b/pytest-selenium/requirements-dev.txt
index 9593b4d430..cb02700602 100644
--- a/pytest-selenium/requirements-dev.txt
+++ b/pytest-selenium/requirements-dev.txt
@@ -31,12 +31,8 @@ pytest-testrail==2.9.0
 pytest-variables==2.0.0
 python-dateutil==2.8.2
 PyYAML==6.0
-<<<<<<< HEAD
-requests==2.31.0
-requests-mock==1.12.1
-=======
 requests==2.32.0
->>>>>>> 9e75bdc72976fdd85e93fdd2274fe8296f946ace
+requests-mock==1.12.1
 selenium==3.141.0
 simplejson==3.17.6
 six==1.16.0