From: shamoon <4887959+shamoon@users.noreply.github.com>
Date: Tue, 13 May 2025 14:06:29 +0000 (-0700)
Subject: Fix merge conflict
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=01285c96d4adf565024fd6320e99c80f71bb8770;p=thirdparty%2Fpaperless-ngx.git

Fix merge conflict
---

diff --git a/src-ui/src/app/data/paperless-config.ts b/src-ui/src/app/data/paperless-config.ts
index f41776e78..01f2b3551 100644
--- 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,