Skip to content

Commit

Permalink
merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
kayla-glick committed Dec 9, 2023
1 parent 965a7eb commit 44173b1
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion _site/404.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
{"@context":"https://schema.org","@type":"WebPage","description":"Welcome to WoWSims! This is a community-driven project to provide simulations for World of Warcraft® Classic™ Classes &amp; Raids together with the leading theorycrafters and class representatives.","headline":"WoWSims - WoW Classic Simulators","url":"http://localhost:4000/404.html"}</script>
<!-- End Jekyll SEO tag -->

<link rel="stylesheet" href="/assets/css/style.css?v=e70e0d251005b34626b679688e54044888e00c17">
<link rel="stylesheet" href="/assets/css/style.css?v=965a7eb30431dcb23c3c8c4dd0a2e96c6ea191ae">
<!-- start custom head snippets, customize with your own _includes/head-custom.html file -->

<!-- Setup Google Analytics -->
Expand Down
2 changes: 1 addition & 1 deletion _site/about/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
{"@context":"https://schema.org","@type":"WebSite","description":"Welcome to WoWSims! This is a community-driven project to provide simulations for World of Warcraft® Classic™ Classes &amp; Raids together with the leading theorycrafters and class representatives.","headline":"About","name":"WoWSims - WoW Classic Simulators","url":"http://localhost:4000/about/"}</script>
<!-- End Jekyll SEO tag -->

<link rel="stylesheet" href="/assets/css/style.css?v=e70e0d251005b34626b679688e54044888e00c17">
<link rel="stylesheet" href="/assets/css/style.css?v=965a7eb30431dcb23c3c8c4dd0a2e96c6ea191ae">
<!-- start custom head snippets, customize with your own _includes/head-custom.html file -->

<!-- Setup Google Analytics -->
Expand Down

0 comments on commit 44173b1

Please sign in to comment.