From b1f1dc5aa866546ae34d1125be8ac3761fcdb2de Mon Sep 17 00:00:00 2001
From: Mylloon <kennel.anri@tutanota.com>
Date: Fri, 9 Dec 2022 22:14:41 +0100
Subject: [PATCH] ignore .conflicts files

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 63f354b..79a5844 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 _build
+*.conflicts
 
 *.byte
 *.cmi