user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
Fix merge conflict

found in https://github.com/rust-lang/miri/pull/2363#discussion_r956100939
This commit is contained in:
bors 2022-08-26 14:38:14 +00:00
commit 4ae68749f7
1 changed files with 0 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
.gitignore vendored
View file

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