mirror of
				https://github.com/paperless-ngx/paperless-ngx.git
				synced 2025-11-04 03:27:12 -05:00 
			
		
		
		
	Fix merge conflict
This commit is contained in:
		
							parent
							
								
									3e6ba34c5e
								
							
						
					
					
						commit
						01285c96d4
					
				@ -269,6 +269,8 @@ export const PaperlessConfigOptions: ConfigOption[] = [
 | 
				
			|||||||
    type: ConfigOptionType.JSON,
 | 
					    type: ConfigOptionType.JSON,
 | 
				
			||||||
    config_key: 'PAPERLESS_CONSUMER_TAG_BARCODE_MAPPING',
 | 
					    config_key: 'PAPERLESS_CONSUMER_TAG_BARCODE_MAPPING',
 | 
				
			||||||
    category: ConfigCategory.Barcode,
 | 
					    category: ConfigCategory.Barcode,
 | 
				
			||||||
 | 
					  },
 | 
				
			||||||
 | 
					  {
 | 
				
			||||||
    key: 'ai_enabled',
 | 
					    key: 'ai_enabled',
 | 
				
			||||||
    title: $localize`AI Enabled`,
 | 
					    title: $localize`AI Enabled`,
 | 
				
			||||||
    type: ConfigOptionType.Boolean,
 | 
					    type: ConfigOptionType.Boolean,
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user