refactor: fix merge conflict by rerunning make upgrade

openedx · Sep 9, 2021 · f9992b1 · f9992b1
2 parents 918c91e + 4209ab3
commit f9992b1
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/requirements/quality.txt b/requirements/quality.txt
@@ -63,6 +63,10 @@ py==1.10.0
     # via
     #   -r requirements/test.txt
     #   pytest
+    #   -r requirements/base.txt
+    #   django-nose
+platformdirs==2.3.0
+    # via pylint
 pycodestyle==2.7.0
     # via -r requirements/quality.in
 pylint==2.10.2