There was a merge conflict when committing Kyle's (#7) rebase (dd53b05bfc03ab34f070ed04c842f63e9a909fd0) so another rebase needs made.
I needed to accept the changes in admin-local-splash.component.html for our bugsquash machine to have the new course reserves under "Local Administration":
There was a merge conflict when committing Kyle's (#7) rebase (dd53b05bfc03ab 34f070ed04c842f 63e9a909fd0) so another rebase needs made.
I needed to accept the changes in admin-local- splash. component. html for our bugsquash machine to have the new course reserves under "Local Administration":
Open-ILS/ src/eg2/ src/app/ staff/admin/ local/admin- local-splash. component. html