[ImageJ-builds] Build failed in Jenkins: Synchronize-and-deploy-IJ1 #5093

[jenkins at imagej.net]

See <http://jenkins.imagej.net/job/Synchronize-and-deploy-IJ1/5093/changes>

Changes:

[Johannes Schindelin] Manually fix up parent version

------------------------------------------
[URLTrigger] A change within the response URL invocation (log)
Building on master in workspace <http://jenkins.imagej.net/job/Synchronize-and-deploy-IJ1/ws/>
Fetching changes from the remote Git repository
Fetching upstream changes from https://github.com/imagej/ImageJA
Checking out Revision 5df63d3801bbcc227c62b9188ea77884b358350f (origin/master)
[workspace] $ /bin/sh -xe /tmp/hudson407856200397784307.sh
+ test -d tools
+ cd tools
+ git pull
>From dev.imagejdev.org:imageja
   fe855cd..3e4c7df  tools      -> origin/tools
error: Your local changes to the following files would be overwritten by merge:
	sync-with-imagej.sh
Please, commit your changes or stash them before you can merge.
Aborting
Updating fe855cd..3e4c7df
Build step 'Execute shell' marked build as failure