From d8cb3ec00a33e0c16457dd83251d74b0a322a9fd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 26 Jul 2023 09:54:55 +0000
Subject: [PATCH] npm-dep: bump bootstrap from 5.3.0 to 5.3.1 in /frontend

Bumps [bootstrap](https://github.com/twbs/bootstrap) from 5.3.0 to 5.3.1.
- [Release notes](https://github.com/twbs/bootstrap/releases)
- [Commits](https://github.com/twbs/bootstrap/compare/v5.3.0...v5.3.1)

---
updated-dependencies:
- dependency-name: bootstrap
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 frontend/package-lock.json | 12 +++++++++++-
 frontend/package.json      |  2 +-
 frontend/pnpm-lock.yaml    | 13 +++++++++++++
 3 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 7b6676c5..afefd8a9 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -23,7 +23,7 @@
 =======
                 "@fortawesome/free-solid-svg-icons": "^6.4.0",
                 "@popperjs/core": "^2.11.8",
-                "bootstrap": "5.3.0",
+                "bootstrap": "5.3.1",
                 "date-fns": "^2.30.0",
                 "pocketbase": "^0.15.3",
                 "sass": "^1.64.1",
@@ -1156,6 +1156,7 @@
             }
         },
         "node_modules/bootstrap": {
+<<<<<<< HEAD
 <<<<<<< HEAD
             "version": "5.3.1",
             "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.3.1.tgz",
@@ -1165,6 +1166,11 @@
             "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.3.0.tgz",
             "integrity": "sha512-UnBV3E3v4STVNQdms6jSGO2CvOkjUMdDAVR2V5N4uCMdaIkaQjbcEAMqRimDHIs4uqBYzDAKCQwCB+97tJgHQw==",
 >>>>>>> f50e272 (npm-dep: bump sass from 1.64.0 to 1.64.1 in /frontend)
+=======
+            "version": "5.3.1",
+            "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.3.1.tgz",
+            "integrity": "sha512-jzwza3Yagduci2x0rr9MeFSORjcHpt0lRZukZPZQJT1Dth5qzV7XcgGqYzi39KGAVYR8QEDVoO0ubFKOxzMG+g==",
+>>>>>>> 5e3023e (npm-dep: bump bootstrap from 5.3.0 to 5.3.1 in /frontend)
             "funding": [
                 {
                     "type": "github",
@@ -1176,11 +1182,15 @@
                 }
             ],
             "peerDependencies": {
+<<<<<<< HEAD
 <<<<<<< HEAD
                 "@popperjs/core": "^2.11.8"
 =======
                 "@popperjs/core": "^2.11.7"
 >>>>>>> f50e272 (npm-dep: bump sass from 1.64.0 to 1.64.1 in /frontend)
+=======
+                "@popperjs/core": "^2.11.8"
+>>>>>>> 5e3023e (npm-dep: bump bootstrap from 5.3.0 to 5.3.1 in /frontend)
             }
         },
         "node_modules/brace-expansion": {
diff --git a/frontend/package.json b/frontend/package.json
index 5734788b..4b3afbd2 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -55,7 +55,7 @@
     "dependencies": {
         "@fortawesome/free-solid-svg-icons": "^6.4.0",
         "@popperjs/core": "^2.11.8",
-        "bootstrap": "5.3.0",
+        "bootstrap": "5.3.1",
         "date-fns": "^2.30.0",
         "pocketbase": "^0.15.3",
         "sass": "^1.64.1",
diff --git a/frontend/pnpm-lock.yaml b/frontend/pnpm-lock.yaml
index 94d128bf..b864900c 100644
--- a/frontend/pnpm-lock.yaml
+++ b/frontend/pnpm-lock.yaml
@@ -7,9 +7,14 @@ settings:
 dependencies:
   '@fortawesome/free-solid-svg-icons':
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
     specifier: ^6.4.2
     version: 6.4.2
+=======
+    specifier: ^6.4.0
+    version: 6.4.0
+>>>>>>> 5e3023e (npm-dep: bump bootstrap from 5.3.0 to 5.3.1 in /frontend)
   '@popperjs/core':
     specifier: ^2.11.8
     version: 2.11.8
@@ -1408,10 +1413,15 @@ packages:
   /binary-extensions@2.2.0:
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
     resolution: {integrity: sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==}
     engines: {node: '>=8'}
 <<<<<<< HEAD
+=======
+    resolution: {integrity: sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==}
+    engines: {node: '>=8'}
+>>>>>>> 5e3023e (npm-dep: bump bootstrap from 5.3.0 to 5.3.1 in /frontend)
 
   /bootstrap@5.3.1(@popperjs/core@2.11.8):
     resolution: {integrity: sha512-jzwza3Yagduci2x0rr9MeFSORjcHpt0lRZukZPZQJT1Dth5qzV7XcgGqYzi39KGAVYR8QEDVoO0ubFKOxzMG+g==}
@@ -1420,6 +1430,7 @@ packages:
     dependencies:
       '@popperjs/core': 2.11.8
     dev: false
+<<<<<<< HEAD
 =======
 =======
 =======
@@ -1439,6 +1450,8 @@ packages:
 >>>>>>> 6878878 (reuse device form, simplify realtime updates)
     dev: true
 >>>>>>> 5340d83 (first commit for tailwind rewrite)
+=======
+>>>>>>> 5e3023e (npm-dep: bump bootstrap from 5.3.0 to 5.3.1 in /frontend)
 
   /brace-expansion@1.1.11:
     resolution: