From ed3f7fda35297e71570bf2f4f4919ce350924dab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Test=C3=A9?= <david.teste@fratris.fr>
Date: Thu, 16 Dec 2021 16:15:30 +0100
Subject: [PATCH] Conflicting comment for batch merge

---
 src/lib.rs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/lib.rs b/src/lib.rs
index c04a44e..85f8733 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -58,6 +58,8 @@ pub struct CaesarEngine<A: Alphabet> {
     shifted_alphabet: Vec<char>,
 }
 
+// A conflicting comment for batch
+
 impl<A: Alphabet> CaesarEngine<A> {
     /// Creates a new
     pub fn new(shift: Shift) -> Self {