http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8318 Paul Poulain <paul.poulain@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Passed QA |Pushed to Master Version|master |rel_3_10 --- Comment #6 from Paul Poulain <paul.poulain@biblibre.com> --- (In reply to comment #5)
Paul,
I just did a fetch from master and applied the patch just fine ... ??? That's strange, I get the following conflict: 134 <<<<<<< HEAD 135 - Define Fields (from the items table) used for statistics members (separate fields with |, for example :"location|itype|ccode"). 136 - 137 - pref: EnableBorrowerFiles 138 choices: 139 yes: Do 140 no: "Don't" 141 - enable the ability to upload and attach arbitrary files to a borrower record. 142 ======= 143 - (separate fields with |) 144 >>>>>>> Bug 8318: Update StatisticsFields preference language
I've rewritten you patch, and pushed, this will remain a mistery -- You are receiving this mail because: You are watching all bug changes.