Update python-app.yml

Author: pancakereport

.github/workflows/python-app.yml

@@ -33,8 +33,4 @@ jobs:
         flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
     - name: Test with pytest
       run: |
-<<<<<<< HEAD
         pytest
-=======
-        pytest
->>>>>>> 30294dc6619dae33b7b085ca53bc7700ad4e9c94