[Koha-bugs] [Bug 4330] Copyright statements out of date

bugzilla-daemon at bugs.koha-community.org bugzilla-daemon at bugs.koha-community.org
Thu Nov 24 14:17:32 CET 2011


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

Paul Poulain <paul.poulain at biblibre.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |paul.poulain at biblibre.com
            Version|master                      |rel_3_6

--- Comment #15 from Paul Poulain <paul.poulain at biblibre.com> 2011-11-24 13:17:32 UTC ---
patch pushed, please test

Push-notes: the 2nd patch was not applying on new/bug_4330 branch:

Applying: Bug 4330: Missing License Statement
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging opac/sco/sco-main.pl
CONFLICT (content): Merge conflict in opac/sco/sco-main.pl
Failed to merge in the changes.
Patch failed at 0001 Bug 4330: Missing License Statement
When you have resolved this problem run "git am --resolved".
If you would prefer to skip this patch, instead run "git am --skip".
To restore the original branch and stop patching run "git am --abort".


As it's just some comment changes, i've pushed the two patches on master
directly.

chris_n= can be applied on 3.6, but from pick-up the patch from master

-- 
Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are watching all bug changes.


More information about the Koha-bugs mailing list