github actions

pazz · Sep 26, 2021 · 341a287 · 341a287
1 parent 8cd1883
commit 341a287
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -3,6 +3,11 @@
 
 name: Python application
 
+<<<<<<< HEAD
+on: workflow_dispatch
+
+=======
+>>>>>>> 8cd1883ecf733ce5f819f3fc7fc94c568445a09e
 on:
   push:
     branches: [ master ]
@@ -18,7 +23,12 @@ jobs:
     - uses: actions/checkout@v2
     - name: Install notmuch
       run: |
+<<<<<<< HEAD
+        sudo apt-cache search notmuch
+        sudo apt-get -y install python-notmuch2
+=======
         sudo apt-get -y install python3-notmuch2
+>>>>>>> 8cd1883ecf733ce5f819f3fc7fc94c568445a09e
     - name: Set up Python 3.9
       uses: actions/setup-python@v2
       with: