deps: update blisb

Author: gadenbuie

shiny/www/shared/bootstrap/_version.json

@@ -1,7 +1,14 @@
 {
+<<<<<<< HEAD
   "note!": "Generated by scripts/htmlDependencies.R: do not edit by hand",
   "shiny_version": "1.8.1.9001 (rstudio/shiny@0b7fda707e4846d2de06f63db312ac35dacf503a)",
   "bslib_version": "0.7.0.9000 (rstudio/bslib@c5244cfae75c434e5fae6091820c13b62de53fd7)",
   "htmltools_version": "0.5.8.9000 (rstudio/htmltools@487aa0bed7313d7597b6edd5810e53cab0061198)",
+=======
+  "note!": "This file is auto-generated by scripts/htmlDependencies.R",
+  "shiny_version": "Github (rstudio/shiny@e689cdc522c65da37342d9348266f50c8d4b3949)",
+  "bslib_version": "Github (rstudio/bslib@55b90f8d335388f24bf9db2cf63236d4b67e693c)",
+  "htmltools_version": "Github (rstudio/htmltools@487aa0bed7313d7597b6edd5810e53cab0061198)",
+>>>>>>> c4960b7d (deps: update blisb)
   "bootstrap_version": "5.3.1"
 }

shiny/www/shared/bootstrap/bootstrap.min.css

@@ -1,5 +1,9 @@
 {
   "note!": "Generated by scripts/htmlDependencies.R: do not edit by hand",
   "package": "bslib",
+<<<<<<< HEAD
   "version": "0.7.0.9000 (rstudio/bslib@c5244cfae75c434e5fae6091820c13b62de53fd7)"
+=======
+  "version": "Github (rstudio/bslib@55b90f8d335388f24bf9db2cf63236d4b67e693c)"
+>>>>>>> c4960b7d (deps: update blisb)
 }