fixed appveyor

Phil-Factor · Jul 19, 2017 · 37a9c64 · 37a9c64
1 parent 96d02f3
commit 37a9c64
Showing 1 changed file with 2 additions and 7 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -6,15 +6,10 @@ skip_commits:
   message: /updated readme.*/
 
 install:
-<<<<<<< HEAD
+
 # Install Package Provider to install PsScriptAnalyzer
   - ps: Install-Module Pester -Force
-=======
-# Install Pester for testing
-  - cinst pester
-# Install Package Provider to install PsScriptAnalyzer
-  - ps: Install-PackageProvider -Name NuGet -Force
->>>>>>> 48e8c570dd87b44152968af4c6dcea50f8737a58
+
 # Install PsScriptAnalyzer to ensure we are following powershell best practices
   - ps: Install-Module PsScriptAnalyzer -Force