fix: correct merge issue

Petr Kachanovsky · Petr Kachanovsky · commit a5e3386f9253 · 2025-01-17T13:31:55.000+02:00
diff --git a/adminforth/modules/configValidator.ts b/adminforth/modules/configValidator.ts
@@ -399,8 +399,6 @@ export default class ConfigValidator implements IConfigValidator {
         }
         
         col.editingNote = typeof inCol.editingNote === 'string' ? { create: inCol.editingNote, edit: inCol.editingNote } : inCol.editingNote;
-        
-        col.showIn = col.showIn || Object.values(AdminForthResourcePages);
 
         if (col.foreignResource) {
 

Original file line number	Diff line number	Diff line change
`@@ -399,8 +399,6 @@ export default class ConfigValidator implements IConfigValidator {`
`399`	`399`	`}`
`400`	`400`
`401`	`401`	`col.editingNote = typeof inCol.editingNote === 'string' ? { create: inCol.editingNote, edit: inCol.editingNote } : inCol.editingNote;`
`402`		`-`
`403`		`- col.showIn = col.showIn \|\| Object.values(AdminForthResourcePages);`
`404`	`402`
`405`	`403`	`if (col.foreignResource) {`
`406`	`404`