Uncomment windows

Author: staticdev

.github/workflows/tests.yml

@@ -12,6 +12,7 @@ jobs:
       fail-fast: false
       matrix:
         include:
+<<<<<<< HEAD
           - { python-version: 3.8, os: ubuntu-latest, session: "pre-commit" }
           - { python-version: 3.8, os: ubuntu-latest, session: "safety" }
           - { python-version: 3.8, os: ubuntu-latest, session: "mypy" }
@@ -26,6 +27,12 @@ jobs:
     env:
       NOXSESSION: ${{ matrix.session }}
 
+=======
+          - { python-version: 3.8, os: ubuntu-latest }
+          - { python-version: 3.8, os: windows-latest }
+          - { python-version: 3.8, os: macos-latest }
+          - { python-version: 3.7, os: ubuntu-latest }
+>>>>>>> Uncomment windows
     steps:
       - name: Check out the repository
         uses: actions/checkout@v2.3.1