Resolved conflict in main.py: combined both workstreams' router imports and registrations (device_router from G, inventory_router from C). 143/143 backend tests pass after cleaning stray pollution from an earlier parallel workstream run against the shared test DB.
686 B
686 B