Update pythonapp.yml

Author: AnonymousX86

.github/workflows/pythonapp.yml

@@ -1,11 +1,7 @@
 # This workflow will install Python dependencies, run tests and lint with a single version of Python
 # For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
 
-<<<<<<< HEAD
 name: Code correctness
-=======
-name: Python Password testing
->>>>>>> dev
 
 on:
   push:
@@ -27,24 +23,14 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-<<<<<<< HEAD
-        pip install flake8
-=======
         pip install flake8 pytest
->>>>>>> dev
         pip install -r requirements.txt
     - 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
-<<<<<<< HEAD
-#    - name: Test with pytest
-#      run: |
-#        pytest
-=======
     - name: Test with pytest
       run: |
-        pytest "python_password/tests/test.py"
->>>>>>> dev
+        pytest "python_password/tests/test.py