From 8d9bc330917da957c4953f0210f6205680fd6927 Mon Sep 17 00:00:00 2001
From: Marco Mariani <marco@crowdsec.net>
Date: Thu, 1 Dec 2022 22:39:40 +0100
Subject: [PATCH] removed diff crumbs

---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index 759c269..1253867 100644
--- a/README.md
+++ b/README.md
@@ -247,7 +247,6 @@ You can then run all the containers:
 docker-compose up -d
 ```
 
-<<<<<<< HEAD
 #### Use certificates to authenticate with CrowdSec
 
 You can follow the example in exemples/tls-auth to view how to authenticate with client certificates with the LAPI.