http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5974
Chris Nighswonger <cnighswon...@foundations.edu> changed:
What |Removed |Added
----------------------------------------------------------------------------
CC| |cnighswon...@foundations.ed
| |u
--- Comment #16 from Chris Nighswonger <cnighswon...@foundations.edu>
2011-12-03 12:21:55 UTC ---
This patch does not apply cleanly to the 3.6.x branch. If it should, please
rebase over that branch and attache a corrected patch to this bug report.
cnighs@erasmus:~/koha.3.2.test (3.6.x)$ git cherry-pick -x -s 9cecb7a9d30dfe
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 9cecb7a9d30dfeb2c39789b7493d20734647b9b6
cnighs@erasmus:~/koha.3.2.test (3.6.x *+)$ git status
# On branch 3.6.x
# Your branch is ahead of 'origin/3.6.x' by 9 commits.
#
# Unmerged paths:
# (use "git reset HEAD <file>..." to unstage)
# (use "git add/rm <file>..." as appropriate to mark resolution)
#
# both modified:
koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc
--
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
Koha-bugs@lists.koha-community.org
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/
