Auto merge of #2510 - oli-obk:merge_conflict, r=oli-obk

bors · bors · commit 4ae68749f790 · 2022-08-26T14:38:14.000Z
Fix merge conflict found in #2363 (comment)
diff --git 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-*
