diff options
author | Bernhard Schommer <bernhardschommer@gmail.com> | 2018-09-10 10:56:54 +0200 |
---|---|---|
committer | Bernhard Schommer <bernhardschommer@gmail.com> | 2018-09-10 10:56:54 +0200 |
commit | 49ecf8a3e5b5a4449f4bcbc1d6d4f55c8b5888be (patch) | |
tree | 24555b7e2ccb414e81f6fbaf700bcf7b632350d1 /runtime/c | |
parent | 95a8854de3479d83df4e41e812bab9d2db9e17e0 (diff) | |
download | compcert-49ecf8a3e5b5a4449f4bcbc1d6d4f55c8b5888be.tar.gz compcert-49ecf8a3e5b5a4449f4bcbc1d6d4f55c8b5888be.zip |
Ignore generated conflict file. Bug 24455
Diffstat (limited to 'runtime/c')
0 files changed, 0 insertions, 0 deletions