resolve conflict with master

hierynomus · May 9, 2023 · 16049ea · 16049ea
1 parent 6bf720c
commit 16049ea
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -27,5 +27,4 @@ test-output/
 
 .metals
 .bloop
-
 MacIntegrationTest.*