chore: resolve conflicts

openedx · Nov 13, 2023 · ebd312d · ebd312d
2 parents a5da873 + 1d74b1b
commit ebd312d
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/requirements/test.txt b/requirements/test.txt
@@ -29,6 +29,7 @@ cffi==1.16.0
     # via
     #   cryptography
     #   pynacl
+charset-normalizer==3.3.2
 charset-normalizer==3.3.2
     # via requests
     # via
@@ -96,12 +97,14 @@ django-webpack-loader==0.7.0
     #   edx-drf-extensions
 drf-jwt==1.19.2
     # via edx-drf-extensions
+edx-django-utils==5.8.0
 edx-django-utils==5.8.0
     # via
     #   edx-drf-extensions
     #   edx-rest-api-client
     #   edx-when
     #   event-tracking
+edx-drf-extensions==8.13.0
 edx-drf-extensions==8.13.0
     # via
     #   -r requirements/base.in
@@ -241,6 +244,7 @@ requests==2.31.0
     #   httmock
     #   responses
     #   slumber
+responses==0.24.0
 responses==0.24.0
     # via -r requirements/test.in
 rules==3.3