Console Output

GitHub pull request #2328 of commit 9ddccda5ec64fe9b389fb1464ef5a3b86110f3c6, has merge conflicts.
Running as SYSTEM
Setting status of 9ddccda5ec64fe9b389fb1464ef5a3b86110f3c6 to PENDING with url https://autotest.bioeng.auckland.ac.nz/jenkins/job/OpenCOR_Windows/1141/ and message: 'Build started for original commit.'
Using context: Windows
Building remotely on Mac10.12.3_OpenCOR (MacOS) in workspace /Users/opencor/jenkins/workspace/OpenCOR_Windows
No credentials specified
 > git rev-parse --is-inside-work-tree # timeout=10
Fetching changes from the remote Git repository
 > git config remote.origin.url https://github.com/opencor/opencor.git # timeout=10
Fetching upstream changes from https://github.com/opencor/opencor.git
 > git --version # timeout=10
 > git fetch --tags --force --progress -- https://github.com/opencor/opencor.git +refs/pull/*:refs/remotes/origin/pr/* # timeout=10
 > git rev-parse 9ddccda5ec64fe9b389fb1464ef5a3b86110f3c6^{commit} # timeout=10
Checking out Revision 9ddccda5ec64fe9b389fb1464ef5a3b86110f3c6 (detached)
 > git config core.sparsecheckout # timeout=10
 > git checkout -f 9ddccda5ec64fe9b389fb1464ef5a3b86110f3c6 # timeout=10
Commit message: "Merge branch 'master' into issue2190."
 > git rev-list --no-walk a19d95172df7fbdbf2e03591d198810c4206905a # timeout=10
Triggering OpenCOR_Windows » Windows10
Aborted
Aborted by Alan Garny
Interrupting #1141
Setting status of 9ddccda5ec64fe9b389fb1464ef5a3b86110f3c6 to FAILURE with url https://autotest.bioeng.auckland.ac.nz/jenkins/job/OpenCOR_Windows/1141/ and message: 'Build finished. '
Using context: Windows
Finished: ABORTED