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 /.gitignore | |
| parent | 95a8854de3479d83df4e41e812bab9d2db9e17e0 (diff) | |
| download | compcert-kvx-49ecf8a3e5b5a4449f4bcbc1d6d4f55c8b5888be.tar.gz compcert-kvx-49ecf8a3e5b5a4449f4bcbc1d6d4f55c8b5888be.zip | |
Ignore generated conflict file. Bug 24455
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -49,6 +49,7 @@ /cparser/pre_parser_messages.ml /cparser/pre_parser.automaton /cparser/pre_parser.messages +/cparser/pre_parser.conflicts /cparser/handcrafted.messages.bak /cparser/handcrafted.messages.raw /cparser/deLexer |