resolve merge conflict: keep jQuery 4.0 from dev + our security patches

Author: collinschreyer-dev

package.json

@@ -34,7 +34,7 @@
     "@angular/router": "~21.2.1",
     "@auth0/angular-jwt": "^5.2.0",
     "@fullcalendar/core": "^6.1.14",
-    "@types/jquery": "^3.5.31",
+    "@types/jquery": "^4.0.0",
     "@uswds/uswds": "^3.11.0",
     "ag-grid-angular": "^29.3.5",
     "angular2-font-awesome": "^1.3.0",
@@ -52,7 +52,7 @@
     "file-saver": "^2.0.5",
     "font-awesome": "^4.7.0",
     "http-proxy-middleware": "^2.0.9",
-    "jquery": "^3.7.1",
+    "jquery": "^4.0.0",
     "json2csv": "^6.0.0-alpha.2",
     "mammoth": "^1.8.0",
     "moment": "^2.30.1",
@@ -110,4 +110,4 @@
     "tmp": "^0.2.4",
     "lodash": "^4.17.22"
   }
-}
+}