Skip to content

Commit e000f22

Browse files
committed
merge conflicts
1 parent 5571006 commit e000f22

3 files changed

Lines changed: 15 additions & 18 deletions

File tree

package.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,10 @@
100100
"@sentry/cli",
101101
"esbuild",
102102
"svelte-preprocess"
103-
]
103+
],
104+
"overrides": {
105+
"seroval": "^1.4.1"
106+
}
104107
},
105108
"packageManager": "pnpm@10.25.0"
106109
}

pnpm-lock.yaml

Lines changed: 11 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/lib/layout/shell.svelte

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -274,15 +274,6 @@
274274
margin-left: 48px;
275275
overflow: auto;
276276
277-
@media (max-width: 767px) {
278-
width: 100vw;
279-
max-width: 100vw;
280-
margin-left: 0;
281-
margin-right: 0;
282-
height: auto;
283-
min-height: 100vh;
284-
}
285-
286277
@media (min-width: 1024px) {
287278
width: 100%;
288279
padding-left: 190px;

0 commit comments

Comments
 (0)