You are currently cherry-picking commit 3112b75d32.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:

	modified:   Open-ILS/examples/fm_IDL.xml
	modified:   Open-ILS/src/eg2/src/app/staff/admin/basic-admin-page.component.ts
	modified:   Open-ILS/src/eg2/src/app/staff/admin/local/admin-carousel.component.ts

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)

	deleted by us:   Open-ILS/src/eg2/src/app/staff/admin/server/floating-group/floating-group.component.ts
	both modified:   Open-ILS/src/eg2/src/app/staff/share/admin-page/admin-page.component.html
	both modified:   Open-ILS/src/eg2/src/app/staff/share/admin-page/admin-page.component.ts