# Conflicts: # client/src/components/job-bills-total/job-bills-total.component.jsx # client/src/components/job-costing-statistics/job-costing-statistics.component.jsx # client/src/components/job-lifecycle/job-lifecycle.component.jsx # client/src/components/job-payments/job-payments.component.jsx # client/src/components/labor-allocations-table/labor-allocations-table.component.jsx # client/src/components/labor-allocations-table/labor-allocations-table.payroll.component.jsx # client/src/components/shop-info/shop-info.component.jsx # client/src/graphql/bodyshop.queries.js # client/src/graphql/jobs.queries.js # client/src/pages/jobs-close/jobs-close.component.jsx # client/src/utils/instanceRenderMgr.js
74 KiB
74 KiB