Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix conflicts in appveyor.yml

Browse Source
This commit is contained in:
Kovid Goyal 2016-11-30 18:03:24 +05:30
parent 21f8414867
commit 47ac17d962
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
appveyor.yml
View File

@ -8,13 +8,6 @@ branches:
- vs2015 - vs2015
cache: cache:
<<<<<<< HEAD
<<<<<<< HEAD
=======
- node_modules
>>>>>>> Start work on setting up CO testing on windows with AppVeyor
=======
>>>>>>> Add AppVeyor badge
- .build-cache - .build-cache
environment: environment: