[ImageJ-builds] Build failed in Jenkins: Fiji-minimal #607

[jenkins at imagej.net]

See <http://jenkins.imagej.net/job/Fiji-minimal/607/>

------------------------------------------
Started by remote host 127.0.0.1
Building on master
[workspace] $ /bin/sh -xe /tmp/hudson2954333942173200763.sh
+ test -d fiji
+ cd fiji
+ git pull -k
error: Your local changes to the following files would be overwritten by merge:
	src-plugins/fake/src/main/java/fiji/build/MiniMaven.java
Please, commit your changes or stash them before you can merge.
Aborting
Updating a86b5fa..4920108
Build step 'Execute shell' marked build as failure