resolved conflicts

Author: ABHISHEKSONI121

.github/workflows/python-app.yml

@@ -30,11 +30,11 @@ jobs:
         if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
     - name: Test with pytest
       run: |
-       git fetch --no-tags --prune --depth=1 origin +refs/heads/*:refs/remotes/origin/*
-       git diff origin/main HEAD --name-only -- practice | xargs dirname | sort | uniq | xargs pytest
+        git fetch --no-tags --prune --depth=1 origin +refs/heads/*:refs/remotes/origin/*
+        git diff origin/main HEAD --name-only -- practice | xargs dirname | sort | uniq | xargs pytest
     - name: Lint with flake8
       run: |
         # stop the build if there are Python syntax errors or undefined names
         flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
         # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
-        flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
+        flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics