rjsf-team
diff --git a/‎package-lock.json‎
Lines changed: 34 additions & 19 deletions b/‎package-lock.json‎
Lines changed: 34 additions & 19 deletions
diff --git a/‎packages/playground/package.json‎
Lines changed: 0 additions & 4 deletions b/‎packages/playground/package.json‎
Lines changed: 0 additions & 4 deletions
@@ -68,12 +68,8 @@
     "react-is": "^18.2.0",
     "react-portal": "^4.2.2",
     "semantic-ui-react": "^2.1.3",
-<<<<<<< HEAD
     "uswds": "^2.14.0",
     "lucide-react": "^0.488.0"
-=======
-    "uswds": "^2.14.0"
->>>>>>> f066e3da (Add USWDS theme)
   },
   "devDependencies": {
     "@babel/cli": "^7.23.9",