Fix merge conflict

2025-08-07 19:08:32 -05:00 · 2025-05-13 07:06:29 -07:00
parent 3e6ba34c5e
commit 01285c96d4
1 changed files with 2 additions and 0 deletions
--- a/src-ui/src/app/data/paperless-config.ts
+++ b/src-ui/src/app/data/paperless-config.ts
@@ -269,6 +269,8 @@ export const PaperlessConfigOptions: ConfigOption[] = [
    type: ConfigOptionType.JSON,
    config_key: 'PAPERLESS_CONSUMER_TAG_BARCODE_MAPPING',
    category: ConfigCategory.Barcode,
+  },
+  {
    key: 'ai_enabled',
    title: $localize`AI Enabled`,
    type: ConfigOptionType.Boolean,