diff options
| author | Michael Schmidt <github@mschmidt.me> | 2016-08-17 16:32:56 +0200 |
|---|---|---|
| committer | Michael Schmidt <github@mschmidt.me> | 2016-08-17 16:32:56 +0200 |
| commit | e0f0f573a4a8fc1f564a31388afa9c23e48bb016 (patch) | |
| tree | b7c004b3aae01c79bef8c8914e759a1e3ce358f7 /.gitignore | |
| parent | 18fcf2ffef8b4ba5eb0624b15371e93b4ac88cfe (diff) | |
| parent | e2b4459ccd1b0f8436cb70a631772d715e642dcd (diff) | |
| download | compcert-e0f0f573a4a8fc1f564a31388afa9c23e48bb016.tar.gz compcert-e0f0f573a4a8fc1f564a31388afa9c23e48bb016.zip | |
fix merge conflicts
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -52,6 +52,7 @@ cparser/tests/generated/*.err backend/CMparser.automaton lib/Readconfig.ml lib/Tokenize.ml +lib/Responsefile.ml driver/Version.ml # Documentation doc/coq2html |