From 651657c03e71992e8dbafd17e727b7d63fc6b102 Mon Sep 17 00:00:00 2001
From: curquiza <clementine@meilisearch.com>
Date: Thu, 7 Sep 2023 16:48:13 +0200
Subject: [PATCH] Fix git conflicts

---
 Cargo.lock | 28 ++++++++++++++--------------
 Cargo.toml |  2 +-
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index e486648f3..03d491ff5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -469,7 +469,7 @@ checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b"
 
 [[package]]
 name = "benchmarks"
-version = "1.3.3"
+version = "1.4.0"
 dependencies = [
  "anyhow",
  "bytes",
@@ -1199,7 +1199,7 @@ dependencies = [
 
 [[package]]
 name = "dump"
-version = "1.3.3"
+version = "1.4.0"
 dependencies = [
  "anyhow",
  "big_s",
@@ -1413,7 +1413,7 @@ dependencies = [
 
 [[package]]
 name = "file-store"
-version = "1.3.3"
+version = "1.4.0"
 dependencies = [
  "faux",
  "tempfile",
@@ -1435,7 +1435,7 @@ dependencies = [
 
 [[package]]
 name = "filter-parser"
-version = "1.3.3"
+version = "1.4.0"
 dependencies = [
  "insta",
  "nom",
@@ -1455,7 +1455,7 @@ dependencies = [
 
 [[package]]
 name = "flatten-serde-json"
-version = "1.3.3"
+version = "1.4.0"
 dependencies = [
  "criterion",
  "serde_json",
@@ -1573,7 +1573,7 @@ dependencies = [
 
 [[package]]
 name = "fuzzers"
-version = "1.3.3"
+version = "1.4.0"
 dependencies = [
  "arbitrary",
  "clap",
@@ -1895,7 +1895,7 @@ dependencies = [
 
 [[package]]
 name = "index-scheduler"
-version = "1.3.3"
+version = "1.4.0"
 dependencies = [
  "anyhow",
  "big_s",
@@ -2082,7 +2082,7 @@ dependencies = [
 
 [[package]]
 name = "json-depth-checker"
-version = "1.3.3"
+version = "1.4.0"
 dependencies = [
  "criterion",
  "serde_json",
@@ -2494,7 +2494,7 @@ checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771"
 
 [[package]]
 name = "meili-snap"
-version = "1.3.3"
+version = "1.4.0"
 dependencies = [
  "insta",
  "md5",
@@ -2503,7 +2503,7 @@ dependencies = [
 
 [[package]]
 name = "meilisearch"
-version = "1.3.3"
+version = "1.4.0"
 dependencies = [
  "actix-cors",
  "actix-http",
@@ -2592,7 +2592,7 @@ dependencies = [
 
 [[package]]
 name = "meilisearch-auth"
-version = "1.3.3"
+version = "1.4.0"
 dependencies = [
  "base64 0.21.2",
  "enum-iterator",
@@ -2611,7 +2611,7 @@ dependencies = [
 
 [[package]]
 name = "meilisearch-types"
-version = "1.3.3"
+version = "1.4.0"
 dependencies = [
  "actix-web",
  "anyhow",
@@ -2665,7 +2665,7 @@ dependencies = [
 
 [[package]]
 name = "milli"
-version = "1.3.3"
+version = "1.4.0"
 dependencies = [
  "big_s",
  "bimap",
@@ -2995,7 +2995,7 @@ checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e"
 
 [[package]]
 name = "permissive-json-pointer"
-version = "1.3.3"
+version = "1.4.0"
 dependencies = [
  "big_s",
  "serde_json",
diff --git a/Cargo.toml b/Cargo.toml
index afa79af5f..9c89aadfb 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -18,7 +18,7 @@ members = [
 ]
 
 [workspace.package]
-version = "1.3.3"
+version = "1.4.0"
 authors = ["Quentin de Quelen <quentin@dequelen.me>", "Clément Renault <clement@meilisearch.com>"]
 description = "Meilisearch HTTP server"
 homepage = "https://meilisearch.com"