Summary: | OMNIBUS, remove accidental 'merge marker' strings from Koha | ||
---|---|---|---|
Product: | Koha | Reporter: | Mason James <mtj> |
Component: | Architecture, internals, and plumbing | Assignee: | Galen Charlton <gmcharlt> |
Status: | CLOSED INVALID | QA Contact: | |
Severity: | normal | ||
Priority: | P5 - low | ||
Version: | Main | ||
Hardware: | All | ||
OS: | All | ||
GIT URL: | Change sponsored?: | --- | |
Patch complexity: | --- | Documentation contact: | |
Documentation submission: | Text to go in the release notes: | ||
Version(s) released in: | Circulation function: |
Description
Mason James
2013-04-02 21:20:53 UTC
here's 2 examples... kohaclone/authorities/authorities.pl: 535 # ======================== 536 # MAIN 537: #========================= 538 my $input = new CGI; 539 my $z3950 = $input->param('z3950'); kohaclone/cataloguing/addbiblio.pl: 714 # ======================== 715 # MAIN 716: #========================= 717 my $input = new CGI; 718 my $error = $input->param('error'); '<<<<' or '>>>>' isn't the pattern to look for. What you want is '^<<<<<' and '^>>>>>'. Fortunately, there is already a test for this: t/00-merge-conflict-markers.t. In principle, one could also look for '^=====', but there are a bunch of files that do that legitimately (e.g., the release notes). Since this issue is already handled, in other words, I'm marking this resolved/invalid. |