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

[jenkins at imagej.net]

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

------------------------------------------
Started by user dscho
Building on master
[workspace] $ /bin/sh -xe /tmp/hudson365479750748026421.sh
+ test -d fiji
+ cd fiji
+ git pull -k
>From git://github.com/fiji/fiji
   fca26b8..f993edb  master     -> origin/master
error: Your local changes to the following files would be overwritten by merge:
	Build.sh
	src-plugins/fake/src/main/java/fiji/build/Fake.java
	src-plugins/fake/src/main/java/fiji/build/MiniMaven.java
Please, commit your changes or stash them before you can merge.
Aborting
Updating fca26b8..f993edb
Build step 'Execute shell' marked build as failure