no message

Courio-Dev · Courio-Dev · commit 0d5d70267255 · 2018-10-01T22:20:00.000+02:00
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -15,12 +15,8 @@ os: Previous Visual Studio 2017
 branches:
   # whitelist
   only:
-<<<<<<< HEAD
-    - master
-=======
     - /^release\/v\d+\.\d+(\.\d+)?(-\S*)?$/
     - /^master$/
->>>>>>> develop
 
 clone_depth: 1
 
