Merge remote-tracking branch 'origin/main' into optional_navbarpage_t…

…itle
rstudio · Oct 24, 2023 · 8edf7ea · 8edf7ea
2 parents c0c68db + 8a09c87
commit 8edf7ea
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 4 deletions.
diff --git a/inst/editor/build/index.html b/inst/editor/build/index.html
@@ -26,11 +26,7 @@
       Learn how to configure a non-root public URL by running `npm run build`.
     -->
     <title>Shiny UI Editor</title>
-<<<<<<< refs/remotes/origin/optional_navbarpage_title
-    <script type="module" crossorigin src="./assets/index-4be970d2.js"></script>
-=======
     <script type="module" crossorigin src="./assets/index-65b19d41.js"></script>
->>>>>>> Commit build assets
     <link rel="stylesheet" href="./assets/index-22085128.css">
   </head>
 

diff --git a/inst/vscode-extension/shinyuieditor-0.5.1.vsix b/inst/vscode-extension/shinyuieditor-0.5.1.vsix