From 16049ea95fa977e97152fabee32014aaa5780d24 Mon Sep 17 00:00:00 2001
From: Jeroen van Erp <jeroen@hierynomus.com>
Date: Tue, 9 May 2023 15:09:57 +0200
Subject: [PATCH] resolve conflict with master

---
 .gitignore | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index f39cc7ec..ec33f8ca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,5 +27,4 @@ test-output/
 
 .metals
 .bloop
-
 MacIntegrationTest.*