Merge remote-tracking branch 'origin/dev' into dev

# Conflicts: # dinky-web/src/components/CustomEditor/CodeShow/index.tsx # dinky-web/src/components/CustomEditor/languages/javalog/index.tsx # dinky-web/src/pages/DataStudio/BottomContainer/Console/ConsoleContent.tsx
Zzm0809 · Oct 27, 2023 · 367a670 · 367a670
2 parents 64322b8 + 3486bdb
commit 367a670
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/dinky-web/config/config.ts b/dinky-web/config/config.ts
@@ -193,5 +193,5 @@ export default defineConfig({
     strategy: 'normal'
   },
   // requestRecord: {},
-  dva: {},
+  dva: {}
 });