From 22a58b3ff2d03560fb8d026a0095854c45d9cbae Mon Sep 17 00:00:00 2001
From: Brian 'bdougie' Douglas <ilikerobot@gmail.com>
Date: Fri, 9 Apr 2021 17:09:11 -0400
Subject: [PATCH] fixed indentation

---
 .github/workflows/deploy.yml | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index cd3b9532..04bdee9d 100644
--- 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