http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=6390
Chris Nighswonger <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |[email protected] | |u --- Comment #43 from Chris Nighswonger <[email protected]> 2011-11-16 14:19:55 UTC --- This patch does not apply cleanly to the 3.4.x branch. If it should, please rebase against that branch and attach a corrected patch to this bug. cnighs@erasmus:~/koha.3.2.test (3.4.x)$ git cherry-pick -x -s 58bdfdb08883eb5 Automatic cherry-pick failed. After resolving the conflicts, mark the corrected paths with 'git add <paths>' or 'git rm <paths>' and commit the result with: git commit -c 58bdfdb08883eb52777321f883491eaff1493857 cnighs@erasmus:~/koha.3.2.test (3.4.x *+)$ git status # On branch 3.4.x # Your branch is ahead of 'origin/3.4.x' by 21 commits. # # Unmerged paths: # (use "git reset HEAD <file>..." to unstage) # (use "git add/rm <file>..." as appropriate to mark resolution) # # both modified: acqui/booksellers.pl -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the QA Contact for the bug. You are watching all bug changes. _______________________________________________ Koha-bugs mailing list [email protected] http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs website : http://www.koha-community.org/ git : http://git.koha-community.org/ bugs : http://bugs.koha-community.org/
