diff options
author | Sean Whitton <spwhitton@spwhitton.name> | 2022-11-09 14:08:12 -0700 |
---|---|---|
committer | Sean Whitton <spwhitton@spwhitton.name> | 2022-11-09 14:08:12 -0700 |
commit | 82e5df5f697b53f8e9e1cc27bce73a80188011d0 (patch) | |
tree | 4ae0aa22d43fefbc5831ba11515cb102d43f3621 /.gitignore | |
parent | a49fb252ae0781b550dc29578cdd8e4a4de49ca3 (diff) | |
parent | 5b9b393c614f18f7cc2260436fbf99ed2a6d05ed (diff) | |
download | emacs-82e5df5f697b53f8e9e1cc27bce73a80188011d0.tar.gz |
Merge remote-tracking branch 'origin/master' into athena/unstable
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index 3b965d62478..4a92414f1ad 100644 --- a/.gitignore +++ b/.gitignore @@ -329,7 +329,7 @@ lib-src/seccomp-filter-exec.pfc /etc/*.gschema.valid # Ignore directory made by admin/make-manuals. -manual/ +/manual/ # Ignore Finder files on MacOS. .DS_Store |