Fix merge conflicts

Enterprise-CMCS · Aug 29, 2024 · ee5389e · ee5389e
2 parents 41333e9 + f2bea91
commit ee5389e
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/services/cypress/package.json b/services/cypress/package.json
@@ -47,16 +47,16 @@
         "c8": "^10.1.2",
         "cypress": "^13.13.2",
         "cypress-axe": "^1.5.0",
-        "husky": "^9.0.11",
+        "husky": "^9.1.5",
         "lint-staged": "^15.2.2",
         "prettier": "^3.3.3"
     },
     "dependencies": {
         "@apollo/client": "3.8.8",
-        "aws-amplify": "^5.0.10",
-        "axios": "^1.7.4",
         "cypress-file-upload": "^5.0.8",
         "cypress-pipe": "^2.0.0",
+        "aws-amplify": "^5.0.10",
+        "axios": "^1.7.4",
         "graphql": "^16.9.0",
         "protobufjs": "^7.3.0"
     }