gnucash docs failng to build

[Derek Atkins]

Hi,

I've noticed that the gnucash docs have failed to build for the last few
days.  Today I took a look at it, because the failure was "git pull
failed" which I found odd.  I ran it by hand:

>From ssh://code.gnucash.org/gnucash
   29923b1..1d3cee1  trunk      -> origin/trunk
   29923b1..1d3cee1  master     -> origin/master
error: Your local changes to the following files would be overwritten by merge:
	packaging/win32/ChineseSimp-12-5.1.11.isl
	packaging/win32/ChineseTrad-2-5.1.11.isl
	packaging/win32/Greek-4-5.1.11.isl
	packaging/win32/Japanese-5-5.1.11.isl
	packaging/win32/webkit-1.2.7-configure.patch
	packaging/win32/webkit-1.2.7-datadir.patch
	packaging/win32/webkit-1.2.7-gccpath.patch
	packaging/win32/webkit-1.2.7-makefile.patch
	packaging/win32/webkit-1.2.7-nosvg.patch
Please, commit your changes or stash them before you can merge.
Aborting

Most likely this is due to the removal of packaging/win32..  But I'm not
sure why the removal would cause an issue, or why the local checkout
would think it's bad.  Anyways, unless I hear otherwise I'll just
manually remove packaging/win32 and re-pull, hoping that will clear the
error.

-derek
-- 
       Derek Atkins, SB '93 MIT EE, SM '95 MIT Media Laboratory
       Member, MIT Student Information Processing Board  (SIPB)
       URL: http://web.mit.edu/warlord/    PP-ASEL-IA     N1NWH
       warlord at MIT.EDU                        PGP key available