https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20968 --- Comment #24 from Kyle M Hall <kyle@bywatersolutions.com> --- (In reply to Andrew Isherwood from comment #23)
Any clue as to why this patch isn't applying for you Jonathan? It's literally replacing tabs with spaces, so no idea why it wouldn't apply. Presumably since Kyle signed it off, it applied for him?
It longer applies for me either. Here's the conflict that needs resolved in detail.pl: 313 <<<<<<< HEAD 314 315 316 if ( $analyze ) { 317 # count if item is used in analytical bibliorecords 318 # The 'countanalytics' flag is only used in the templates if analyze is set 319 my $countanalytics = C4::Context->preference('EasyAnalyticalRecords') ? GetAnalyticsCount($item->{itemnumber}) : 0; 320 if ($countanalytics > 0){ 321 $analytics_flag=1; 322 $item->{countanalytics} = $countanalytics; 323 } 324 ======= 325 326 #count if item is used in analytical bibliorecords 327 my $countanalytics= GetAnalyticsCount($item->{itemnumber}); 328 if ($countanalytics > 0){ 329 $analytics_flag=1; 330 $item->{countanalytics} = $countanalytics; 331 >>>>>>> Bug 20968: (follow-up) Replace tabs with spaces -- You are receiving this mail because: You are watching all bug changes.