File tree Expand file tree Collapse file tree 3 files changed +8
-4
lines changed
Expand file tree Collapse file tree 3 files changed +8
-4
lines changed Original file line number Diff line number Diff line change 44#
55# make upgrade
66#
7+ <<<<<<< HEAD
78asgiref==3.10.0
9+ =======
10+ asgiref==3.9.2
11+ >>>>>>> 8dd1b47 (chore: upgrade requirements)
812 # via django
913django==4.2.25
1014 # via
@@ -14,7 +18,11 @@ dnspython==2.8.0
1418 # via pymongo
1519edx-opaque-keys[django]==3.0.0
1620 # via -r requirements/base.in
21+ <<<<<<< HEAD
1722pymongo==4.15.2
23+ =======
24+ pymongo==4.15.1
25+ >>>>>>> 8dd1b47 (chore: upgrade requirements)
1826 # via edx-opaque-keys
1927sqlparse==0.5.3
2028 # via django
Original file line number Diff line number Diff line change @@ -225,8 +225,6 @@ pluggy==1.6.0
225225 # pytest
226226 # pytest-cov
227227 # tox
228- pycodestyle==2.14.0
229- # via -r requirements/quality.txt
230228pycparser==2.23
231229 # via
232230 # -r requirements/quality.txt
Original file line number Diff line number Diff line change @@ -134,8 +134,6 @@ pluggy==1.6.0
134134 # -r requirements/test.txt
135135 # pytest
136136 # pytest-cov
137- pycodestyle==2.14.0
138- # via -r requirements/quality.in
139137pycparser==2.23
140138 # via cffi
141139pygments==2.19.2
You can’t perform that action at this time.
0 commit comments