Evergreen

  1. Bug #1749475
  2. Comment #10

Comment 10 for bug 1749475

Revision history for this message
Jason Stephenson (jstephenson) wrote :

The branch needs a rebase on master, I get conflicts in the following files:

 both modified: Open-ILS/src/eg2/package-lock.json
 both modified: Open-ILS/src/eg2/package.json
 both modified: Open-ILS/src/eg2/src/app/staff/admin/basic-admin-page.component.ts
 both modified: Open-ILS/src/sql/Pg/950.data.seed-values.sql

My attempt at such a rebase is in collab/dyrcona/lp-1749475-print_email_improvements-rebase