diff options
| author | Thomas Haller <thaller@redhat.com> | 2017-04-19 11:45:49 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2017-04-19 11:53:31 +0200 |
| commit | 865205650bcc14c26d6832c96f284859a56b8ef0 (patch) | |
| tree | 87a0305eb87d7f3debfdcde11fe252e24224a10a | |
| parent | 0f14c2bdcc7f5be63a585ee4a4ad9df881b4b3ee (diff) | |
| download | NetworkManager-865205650bcc14c26d6832c96f284859a56b8ef0.tar.gz | |
gitignore: ignore generated files from master branch
| -rw-r--r-- | .gitignore | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 456671e5f1..72619976b1 100644 --- a/.gitignore +++ b/.gitignore @@ -304,3 +304,8 @@ test-*.trs /libnm/nm-keyfile-docs.xml /libnm/nm-setting-docs.xml /libnm/nm-setting-docs-overrides.xml + +# The following names are present on newer upstream. Ignore them +# also when switching branches +/clients/common/settings-docs.c +/clients/common/tests |