summaryrefslogtreecommitdiff
path: root/packages/sysconf/files/conffiles
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2007-05-17 19:24:23 +0000
committerKoen Kooi <koen@openembedded.org>2007-05-17 19:24:23 +0000
commitdd8734fb36d95b8faca5db0a9967f7828fc75433 (patch)
tree326a78a014ab11806f5e2b0060706e755412c1b6 /packages/sysconf/files/conffiles
parent3ded06f5504f9a7b60b67aa9e280c3d3da2366f8 (diff)
parent09d0c6da109b9c875800dd46ff7d848c153322f4 (diff)
merge of '093b89e2fccb4864b6f56bcb61c6455a90dc384e'
and 'a87cb9fd512dbac5e9ea1f2571e2c946278a28ad'
Diffstat (limited to 'packages/sysconf/files/conffiles')
-rw-r--r--packages/sysconf/files/conffiles1
1 files changed, 0 insertions, 1 deletions
diff --git a/packages/sysconf/files/conffiles b/packages/sysconf/files/conffiles
index d99047ce24..6e6842d6cd 100644
--- a/packages/sysconf/files/conffiles
+++ b/packages/sysconf/files/conffiles
@@ -20,7 +20,6 @@
# preserve Preserve this file unconditionally
# diff Compare file with the new version, ask if different
#
-preserve linuxrc
preserve etc/.configured
preserve etc/TZ
diff etc/default/conffiles