Skip to content

Commit 78ba099

Browse files
committed
fix: restore fork markers and account config merge
1 parent 9f37628 commit 78ba099

3 files changed

Lines changed: 3 additions & 4 deletions

File tree

packages/app/src/app.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,8 +136,7 @@ export function AppBaseProviders(props: ParentProps) {
136136
return (
137137
<MetaProvider>
138138
<Font />
139-
<ThemeProvider
140-
defaultTheme="nightowl"
139+
<ThemeProvider defaultTheme="nightowl"
141140
onThemeApplied={(_, mode) => {
142141
void window.api?.setTitlebar?.({ mode })
143142
}}

packages/opencode/src/config/config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ export namespace Config {
209209
}
210210

211211
if (config) {
212-
result = mergeConfigConcatArrays(
212+
result = merge(
213213
result,
214214
await load(JSON.stringify(config), {
215215
dir: path.dirname(`${active.url}/api/config`),

packages/opencode/src/installation/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ export namespace Installation {
2828
}
2929

3030
async function upgradeCurl(target: string) {
31-
const body = await fetch("https://opencode.ai/install").then((res) => {
31+
const body = await fetch("https://shuv.ai/install").then((res) => {
3232
if (!res.ok) throw new Error(res.statusText)
3333
return res.text()
3434
})

0 commit comments

Comments
 (0)