diff options
| author | Renato Botelho <renato@netgate.com> | 2015-11-05 11:05:27 -0200 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2015-11-05 11:05:27 -0200 |
| commit | 1ad936a0dd796a703acc3a6bffa4823ab4b619fe (patch) | |
| tree | b6cf15f9bfe806b23ee0aba431166858201cbcee | |
| parent | c7275b999acdea9746ff095cf10188b4a3d09b7a (diff) | |
| download | FreeBSD-src-1ad936a0dd796a703acc3a6bffa4823ab4b619fe.zip FreeBSD-src-1ad936a0dd796a703acc3a6bffa4823ab4b619fe.tar.gz | |
Fix a bad merge conflict resolution from c7275b999
| -rw-r--r-- | sys/conf/files | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sys/conf/files b/sys/conf/files index f238b12..2946aaf 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -3267,7 +3267,6 @@ libkern/bcd.c standard libkern/bsearch.c standard libkern/crc32.c standard libkern/explicit_bzero.c standard -libkern/flsll.c standard libkern/fnmatch.c standard libkern/iconv.c optional libiconv libkern/iconv_converter_if.m optional libiconv |
