From 43bb5176a9ef339ccb1dc028e8e27f1615b4732e Mon Sep 17 00:00:00 2001
From: mohandasspat <mohan.s@pavo-tusker.com>
Date: Mon, 22 Aug 2022 10:30:07 +0530
Subject: [PATCH] conflict fixes

---
 meilisearch-http/src/option.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meilisearch-http/src/option.rs b/meilisearch-http/src/option.rs
index 5bc576823..e97bf39d7 100644
--- a/meilisearch-http/src/option.rs
+++ b/meilisearch-http/src/option.rs
@@ -165,7 +165,7 @@ impl Opt {
     pub fn analytics(&self) -> bool {
         !self.no_analytics
     }
-    
+
     pub fn get_ssl_config(&self) -> anyhow::Result<Option<rustls::ServerConfig>> {
         if let (Some(cert_path), Some(key_path)) = (&self.ssl_cert_path, &self.ssl_key_path) {
             let config = rustls::ServerConfig::builder().with_safe_defaults();