fixed indentation

bdougie · Apr 9, 2021 · 22a58b3 · 22a58b3
1 parent 66d51e6
commit 22a58b3
Showing 1 changed file with 2 additions and 7 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -1,11 +1,6 @@
 name: 'Deploy'
 on:
-<<<<<<< HEAD
   workflow_dispatch: 
-=======
-  workflow_dispatch:
-
->>>>>>> 97877e6... set up staging environment
   push:
     branches:
       - develop
@@ -45,8 +40,8 @@ jobs:
     needs: build
     steps:
     - name: npm install
-        run: |
-          npm install
+      run: |
+        npm install
     - name: npm run generate
       run: |
         npm run generate