mirror of https://github.com/rust-lang/rust.git
Fix merge conflict
This commit is contained in:
parent
515038ed7d
commit
fa1e51ae7d
|
@ -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-*
|
||||
|
|
Loading…
Reference in New Issue