aboutsummaryrefslogtreecommitdiffstats
path: root/platform
diff options
context:
space:
mode:
authorLibravatar Fred-Barclay <Fred-Barclay@users.noreply.github.com>2017-07-30 09:25:43 -0500
committerLibravatar Fred-Barclay <Fred-Barclay@users.noreply.github.com>2017-07-30 09:25:43 -0500
commitd6238e0abe9133ce1d649200c959da6935c33a99 (patch)
treed62ca9f8d64d7cfd205ef39e0688ee9a7983aa69 /platform
parentmerges (diff)
downloadfirejail-d6238e0abe9133ce1d649200c959da6935c33a99.tar.gz
firejail-d6238e0abe9133ce1d649200c959da6935c33a99.tar.zst
firejail-d6238e0abe9133ce1d649200c959da6935c33a99.zip
merges
Diffstat (limited to 'platform')
-rw-r--r--platform/debian/conffiles1
1 files changed, 1 insertions, 0 deletions
diff --git a/platform/debian/conffiles b/platform/debian/conffiles
index ac619a046..54bd2f697 100644
--- a/platform/debian/conffiles
+++ b/platform/debian/conffiles
@@ -16,6 +16,7 @@
16/etc/firejail/amarok.profile 16/etc/firejail/amarok.profile
17/etc/firejail/android-studio.profile 17/etc/firejail/android-studio.profile
18/etc/firejail/arduino.profile 18/etc/firejail/arduino.profile
19/etc/firejail/arm.profile
19/etc/firejail/ark.profile 20/etc/firejail/ark.profile
20/etc/firejail/atom-beta.profile 21/etc/firejail/atom-beta.profile
21/etc/firejail/atom.profile 22/etc/firejail/atom.profile