Resolve merge conflicts

hackforla · Nov 13, 2024 · c14e8f8 · c14e8f8
2 parents d98a00b + fff5347
commit c14e8f8
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/client/package.json b/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tdm-calculator-client",
-  "version": "0.2.52",
+  "version": "0.2.53",
   "private": true,
   "proxy": "http://localhost:5001",
   "scripts": {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "root",
-  "version": "0.2.52",
+  "version": "0.2.53",
   "private": true,
   "scripts": {
     "release-notes": "gren release --override",

diff --git a/server/package.json b/server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tdm-calculator-api",
-  "version": "0.2.52",
+  "version": "0.2.53",
   "description": "Transportation Demand Management Calculator",
   "repository": {
     "type": "git",