merged

Author: mivano

appveyor.yml

@@ -7,12 +7,6 @@ test: off
 artifacts:
   - path: artifacts/Serilog.Sinks.Elasticsearch*.nupkg
   - path: artifacts/Serilog.Formatting.Elasticsearch*.nupkg
-<<<<<<< HEAD
-deploy:
-- provider: NuGet
-  api_key:
-    secure: nvZ/z+pMS91b3kG4DgfES5AcmwwGoBYQxr9kp4XiJHj25SAlgdIxFx++1N0lFH2x
-=======
 only_commits:
   files:
     - serilog-sinks-elasticsearch.sln
@@ -27,7 +21,6 @@ deploy:
 - provider: NuGet
   api_key:
     secure: jWslQvxA4UMn98aYnsFDBfl8A2vAXUjtmmPZNxZnbJvMW/JV55iQ1fRcqD9B70sK
->>>>>>> dev
   on:
     branch: /^(master|dev)$/
 - provider: GitHub
@@ -43,4 +36,4 @@ assembly_info:
   patch: false
 before_build:
   - dotnet restore serilog-sinks-elasticsearch.sln
-  - ps: gitversion /l console /output buildserver /updateAssemblyInfo
+  - ps: gitversion /l console /output buildserver /updateAssemblyInfo