fix readme

Recidiviz · Sep 13, 2022 · ba91823 · ba91823
1 parent 08dd17d
commit ba91823
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -0,0 +1,3 @@
+# justice-counts
+
+Technical infrastructure for the Justice Counts initiative
diff --git a/publisher/README.md b/publisher/README.md
@@ -1,7 +1,3 @@
-<<<<<<< HEAD
-# justice-counts
-Technical infrastructure for the Justice Counts initiative
-=======
 # Justice Counts Control Panel: Frontend
 
 Welcome to the Justice Counts Control Panel - a tool that allows agencies to report Justice Counts metrics.
@@ -32,4 +28,3 @@ To run the app locally, you need to spin up both the backend and frontend simult
    yarn test
    yarn lint
    ```
->>>>>>> 47b3a8316fb088dc90672a36eefb3e8feb4385c1