fixing merge conflicts

This commit is contained in:
lucasmbrown-usds 2022-09-30 13:43:31 -04:00
commit 07c4c030d3
266 changed files with 1868 additions and 1811 deletions

View file

@ -19,4 +19,4 @@ The methodology for Justice40 will continue to evolve. The steps outlined below
16. In the frontend, display new indicators in sidepanel
17. Update copy on methodology page
18. Update copy on .pdf in download package
19. Update technical support document (if necessary - TSD will include the final .pdf from download package)
19. Update technical support document (if necessary - TSD will include the final .pdf from download package)