From fa1e51ae7ddf5a18b73bdfa93ae194fb1a50a774 Mon Sep 17 00:00:00 2001
From: Oli Scherer <git-spam-no-reply9815368754983@oli-obk.de>
Date: Fri, 26 Aug 2022 14:35:40 +0000
Subject: [PATCH] Fix merge conflict

---
 .gitignore | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index c1d3d33576..924a93e807 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,11 +9,5 @@ tex/*/out
 perf.data
 perf.data.old
 flamegraph.svg
-<<<<<<< HEAD
-=======
-<<<<<<< HEAD
 tests/extern-so/libtestlib.so
-=======
->>>>>>> master
->>>>>>> 58ba05a0 (C FFI support for functions with int args and returns)
 .auto-*