summaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2018-08-15 15:45:48 +0000
committerintrigeri <intrigeri@boum.org>2018-08-15 15:45:48 +0000
commit57a4453c64dbb78447409ff27c8bbebf7864fa34 (patch)
tree6e2c5cc2e83ae8e9768f93fa67d2aa91af2ac066 /.gitignore
parent75841f3a654d152abf20032e94b1b8f598156e53 (diff)
parent18b65bf2a6cc4c636ec346d34dbbd7bcd4c0f040 (diff)
Merge remote-tracking branch 'origin/devel' into feature/14594-asp-gui
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore4
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index 9630fc7..453ac7f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,11 +23,11 @@
/config/source
/config/chroot_local-includes/etc/amnesia/environment
/config/chroot_local-includes/etc/amnesia/version
-/config/chroot_local-includes/usr/share/amnesia/readahead-list
-/config/chroot_local-includes/usr/share/amnesia/build/variables
/config/chroot_local-includes/usr/share/doc/Changelog
/config/chroot_local-includes/usr/share/doc/amnesia/Changelog
/config/chroot_local-includes/usr/share/doc/tails/website
+/config/chroot_local-includes/usr/share/tails/build/variables
+/config/chroot_local-includes/usr/share/tails/readahead-list
/.lock
/.stage
/source