-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: Fixed the index.html page to resolve merge conflict and bumped t…
…he version number
- Loading branch information
1 parent
3e8f0f4
commit 93c7607
Showing
2 changed files
with
1 addition
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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, | ||
|
@@ -29,7 +23,6 @@ | |
{ accessStyles: true } | ||
), | ||
onRamps: true, | ||
>>>>>>> resourceCatalogUpdates | ||
}); | ||
</script> | ||
</body> | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters