[Koha-bugs] [Bug 5349] Moving an order

[bugzilla-daemon at bugs.koha-community.org]

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5349

--- Comment #72 from David Cook <dcook at prosentient.com.au> ---
Hey Julian,

Could you rebase this patch? (see my error message below)

I'm really keen to see this get into Koha (and hopefully 3.8.x), so I'm willing
to test this as much as necessary :). 

GIT ERROR MESSAGE:

Applying: Bug 5349: Order line transfers
Using index info to reconstruct a base tree...
<stdin>:256: new blank line at EOF.
+
warning: 1 line adds whitespace errors.
Falling back to patching base and 3-way merge...
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
Auto-merging installer/data/mysql/updatedatabase.pl
CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl
Auto-merging installer/data/mysql/kohastructure.sql
Auto-merging C4/Acquisition.pm
CONFLICT (content): Merge conflict in C4/Acquisition.pm
Failed to merge in the changes.
Patch failed at 0001 Bug 5349: Order line transfers

-- 
You are receiving this mail because:
You are watching all bug changes.