diff options
| author | Mikhail Rakhmanov <[email protected]> | 2020-06-03 18:26:01 +0100 |
|---|---|---|
| committer | Mikhail Rakhmanov <[email protected]> | 2020-06-03 18:26:01 +0100 |
| commit | 6a0083a519680e8d16bde5d7c1940c8dd6d4e9d4 (patch) | |
| tree | 2b377141d722257cfea18e74b955aea1a8f6cc1a /.gitignore | |
| parent | 1f7de306f547ecb394a34445fd6ac1d6bc8ab439 (diff) | |
| parent | 794f6da821c5d6e2490b996baffe162e4753262d (diff) | |
Merge branch 'master' into compute-lazy-assits
# Conflicts:
# crates/rust-analyzer/src/main_loop/handlers.rs
# crates/rust-analyzer/src/to_proto.rs
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index dab51647d..aef0fac33 100644 --- a/.gitignore +++ b/.gitignore | |||
| @@ -8,3 +8,5 @@ crates/*/target | |||
| 8 | *.iml | 8 | *.iml |
| 9 | .vscode/settings.json | 9 | .vscode/settings.json |
| 10 | *.html | 10 | *.html |
| 11 | generated_assists.adoc | ||
| 12 | generated_features.adoc | ||