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

Fix merge conflict found in #2363 (comment)
rust-lang · Aug 26, 2022 · 4ae6874 · 4ae6874
2 parents 515038e + fa1e51a
commit 4ae6874
Showing 1 changed file with 0 additions and 6 deletions.
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-*