fix docs

FairwindsOps · Feb 24, 2021 · 7f1c143 · 7f1c143
1 parent f42af35
commit 7f1c143
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/docs/infrastructure-as-code.md b/docs/infrastructure-as-code.md
@@ -31,7 +31,6 @@ polaris audit --audit-path ./deploy/ \
   --set-exit-code-below-score 90
 ```
 
-<<<<<<< HEAD
 ### Output only showing failed tests
 The CLI to gives you ability to display results containing only failed tests. 
 For example:
@@ -40,7 +39,6 @@ polaris audit --audit-path ./deploy/ \
   --only-show-failed-tests true
 ```
 
-=======
 ### As Github Action
 #### Setup polaris action
 
@@ -79,4 +77,3 @@ steps:
   - name: Use command
     run: polaris version
 ```
->>>>>>> master