mirror of
				https://github.com/meilisearch/meilisearch.git
				synced 2025-10-31 07:56:28 +00:00 
			
		
		
		
	Fix my mistake when resolving conflicts
This commit is contained in:
		| @@ -138,7 +138,6 @@ pub fn default_settings(dir: impl AsRef<Path>) -> Opt { | ||||
|         indexer_options: IndexerOpts { | ||||
|             // memory has to be unlimited because several meilisearch are running in test context. | ||||
|             max_indexing_memory: MaxMemory::unlimited(), | ||||
|             ..Default::default() | ||||
|             ..Parser::parse_from(None as Option<&str>) | ||||
|         }, | ||||
|         ..Parser::parse_from(None as Option<&str>) | ||||
|   | ||||
		Reference in New Issue
	
	Block a user