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

Fix merge conflict

found in rust-lang/miri#2363 (comment)

Author: bors

.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-*