From 7c96bbef71603e5e26a58bbdcf3c69f9feec3f43 Mon Sep 17 00:00:00 2001
From: vx3r <vx3r@127-0-0-1.fr>
Date: Tue, 31 Jan 2023 16:47:13 +0100
Subject: [PATCH] merge and conflicts

---
 ui/package-lock.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/package-lock.json b/ui/package-lock.json
index d80dab2..a9b0a93 100644
--- a/ui/package-lock.json
+++ b/ui/package-lock.json
@@ -10,7 +10,7 @@
       "dependencies": {
         "axios": "^0.21.4",
         "is-cidr": "^4.0.2",
-        "moment": "^2.29.1",
+        "moment": "^2.29.4",
         "vue": "^2.6.14",
         "vue-axios": "^3.4.0",
         "vue-moment": "^4.1.0",