Skip to content

Commit

Permalink
fix: Fixed the index.html page to resolve merge conflict and bumped t…
Browse files Browse the repository at this point in the history
…he version number
  • Loading branch information
rebeccaeve committed Sep 18, 2024
1 parent 3e8f0f4 commit 93c7607
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 8 deletions.
7 changes: 0 additions & 7 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,6 @@
href="https://cdn.jsdelivr.net/npm/[email protected]/font/bootstrap-icons.min.css"
/>
<script type="module">
<<<<<<< HEAD
import { projectsBrowser } from "/src/main.jsx";
projectsBrowser({
apiUrl: "http://localhost:3009/current-projects.json",
target: document.getElementById("projects-react")
=======
import {
resourceCatalog,
shadowTarget,
Expand All @@ -29,7 +23,6 @@
{ accessStyles: true }
),
onRamps: true,
>>>>>>> resourceCatalogUpdates
});
</script>
</body>
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@xras/ui",
"version": "0.1.8",
"version": "0.2.1",
"description": "User interface components for XRAS",
"license": "Apache-2.0",
"type": "module",
Expand Down

0 comments on commit 93c7607

Please sign in to comment.