http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5549
Ian Walls <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Patch Status|Signed Off |Does not apply --- Comment #24 from Ian Walls <[email protected]> 2011-10-14 16:01:48 UTC --- Attempting to merge master into the new/awaiting_qa/bug_5549 yields the following: Auto-merging C4/Budgets.pm Auto-merging C4/Circulation.pm Auto-merging C4/ILSDI/Services.pm Auto-merging C4/Installer/PerlDependencies.pm Auto-merging C4/Items.pm Auto-merging C4/Members.pm CONFLICT (content): Merge conflict in C4/Members.pm Auto-merging C4/Overdues.pm Auto-merging C4/SIP/ILS.pm Auto-merging C4/SIP/Sip.pm Auto-merging C4/TTParser.pm Auto-merging C4/TmplToken.pm Auto-merging C4/TmplTokenType.pm Auto-merging acqui/addorderiso2709.pl Auto-merging acqui/neworderempty.pl Auto-merging admin/aqbudgets.pl Auto-merging admin/aqplan.pl Auto-merging catalogue/detail.pl Auto-merging catalogue/moredetail.pl Auto-merging cataloguing/additem.pl Auto-merging circ/circulation.pl CONFLICT (content): Merge conflict in circ/circulation.pl Auto-merging circ/overdue.pl CONFLICT (content): Merge conflict in circ/overdue.pl Auto-merging circ/returns.pl Auto-merging circ/ypattrodue-attr-search-authvalue.pl CONFLICT (content): Merge conflict in circ/ypattrodue-attr-search-authvalue.pl Auto-merging circ/ysearch.pl CONFLICT (content): Merge conflict in circ/ysearch.pl Removing debian/scripts/koha-create.8 Removing install_misc/apt-get-debian-lenny.sh Removing installer/data/mysql/de-DE/mandatory/sysprefs.sql Removing installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql Removing installer/data/mysql/it-IT/necessari/sysprefs.sql Auto-merging installer/data/mysql/kohastructure.sql CONFLICT (content): Merge conflict in installer/data/mysql/kohastructure.sql Removing installer/data/mysql/nb-NO/1-Obligatorisk/sysprefs.sql Removing installer/data/mysql/pl-PL/mandatory/sysprefs.sql Removing installer/data/mysql/ru-RU/mandatory/system_preferences_only_translation_updating.sql Removing installer/data/mysql/ru-RU/mandatory/system_preferences_only_translation_updating.txt Auto-merging installer/data/mysql/sysprefs.sql Removing installer/data/mysql/uk-UA/mandatory/system_preferences_only_translation_updating.sql Removing installer/data/mysql/uk-UA/mandatory/system_preferences_only_translation_updating.txt Auto-merging installer/data/mysql/updatedatabase.pl CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl Removing koha-tmpl/intranet-tmpl/prog/en/css/intranet-print.css Removing koha-tmpl/intranet-tmpl/prog/en/css/intranet.css Removing koha-tmpl/intranet-tmpl/prog/en/css/intranet2.css Removing koha-tmpl/intranet-tmpl/prog/en/css/intranet2popup.css Removing koha-tmpl/intranet-tmpl/prog/en/css/pages/addbiblio.css Removing koha-tmpl/intranet-tmpl/prog/en/css/staff-global2.css Removing koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-history-search.inc Removing koha-tmpl/intranet-tmpl/prog/en/includes/error-bottom.inc Removing koha-tmpl/intranet-tmpl/prog/en/includes/error-top.inc Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt Removing koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/newbiblio.tt Removing koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqbookfund.tt Removing koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqbudget.tt Removing koha-tmpl/intranet-tmpl/prog/en/modules/help/members/messaging.tt Removing koha-tmpl/intranet-tmpl/prog/en/modules/maint/catmaintain.tt Removing koha-tmpl/intranet-tmpl/prog/en/modules/members/messaging.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt Removing koha-tmpl/intranet-tmpl/prog/img/csv_icon.gif Removing koha-tmpl/intranet-tmpl/prog/img/icon_xml.gif Removing koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/vokal/BOOK-32px.png Removing koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/vokal/BOOK.png Removing koha-tmpl/intranet-tmpl/prog/img/pdficon_large.gif Removing koha-tmpl/opac-tmpl/prog/itemtypeimg/vokal/BOOK-32px.png Removing koha-tmpl/opac-tmpl/prog/itemtypeimg/vokal/BOOK.png Auto-merging members/member.pl Removing members/messaging.pl Auto-merging members/moremember.pl CONFLICT (content): Merge conflict in members/moremember.pl Auto-merging members/notices.pl Auto-merging members/readingrec.pl Auto-merging misc/cronjobs/advance_notices.pl Auto-merging misc/cronjobs/overdue_notices.pl Removing misc/spellcheck_suggest/make_spellcheck_suggest.pl Auto-merging opac/opac-detail.pl Auto-merging opac/opac-reserve.pl Auto-merging opac/opac-user.pl CONFLICT (content): Merge conflict in opac/opac-user.pl Auto-merging reserve/request.pl Auto-merging t/00-testcritic.t CONFLICT (content): Merge conflict in t/00-testcritic.t Removing xt/check_sysprefs.t Removing xt/syspref.t -- 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. _______________________________________________ Koha-bugs mailing list [email protected] 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/
