diff options
| author | QMK Bot <hello@qmk.fm> | 2022-07-16 18:39:27 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2022-07-16 18:39:27 +0000 |
| commit | 9fa14655df114c9da8c720f8364fd9dd4e963d19 (patch) | |
| tree | 8512b900063172a96eab0f7eb90a1206719a4848 | |
| parent | 580bcff4f65a3a9ee301de0fd036de7b610c7ee2 (diff) | |
| parent | 847cca541c3666e687fc5ad6a0d3ba1733b89d81 (diff) | |
Merge remote-tracking branch 'origin/master' into develop
| -rw-r--r-- | .gitignore | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index de2627d9d6..51b0a38e0a 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,10 @@ .DS_Store ._* +# Merge files +*.orig +*.rej + # Build artifacts .clang_complete .build/ |