Skip to content

Commit

Permalink
Resolves conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
walmazacn committed Sep 23, 2024
2 parents e9795c4 + 6894f9b commit 8377d59
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion container/src/LuigiCompoundContainer.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -178,4 +178,4 @@
height: 100%;
border: none;
}
</style>
</style>
3 changes: 2 additions & 1 deletion container/src/LuigiContainer.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@
pathParams &&
sandboxRules &&
searchParams &&
skipInitCheck &&
theme &&
userSettings
);
Expand Down Expand Up @@ -212,7 +213,7 @@
height: 100%;
border: none;
}
main.lui-isolated {
line-height: 0;
}
Expand Down

0 comments on commit 8377d59

Please sign in to comment.