resolve merge conflicts

2018-12-28 14:46:55 -08:00
parent 9deb9890e7 16e6f36116
commit 2eae9f2bb2
29 changed files with 1038 additions and 19 deletions
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -16,4 +16,4 @@ build: false

 #Kick off the CI/CD pipeline
 test_script:
-  - ps: . .\build.ps1
+  - ps: . .\build.ps1