I've pushed an update to 006ba3987768d6cf06e14d0a32c93df6ba754eee to resolve the merge conflict (which was seed data that had been added since this was posted).
https://git.evergreen-ils.org/?p=working/Evergreen.git;a=commit;h=006ba3987768d6cf06e14d0a32c93df6ba754eee
I've pushed an update to 006ba3987768d6c f06e14d0a32c93d f6ba754eee to resolve the merge conflict (which was seed data that had been added since this was posted).
https:/ /git.evergreen- ils.org/ ?p=working/ Evergreen. git;a=commit; h=006ba3987768d 6cf06e14d0a32c9 3df6ba754eee