aboutsummaryrefslogtreecommitdiffstats
path: root/file.c
diff options
context:
space:
mode:
Diffstat (limited to 'file.c')
-rw-r--r--file.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/file.c b/file.c
index 39f500448c..c13f4c6265 100644
--- a/file.c
+++ b/file.c
@@ -1345,7 +1345,7 @@ cf_merge_files(char **out_filenamep, int in_file_count,
int_data.opt_comment = NULL;
int_data.if_description = NULL;
int_data.if_speed = 0;
- int_data.if_tsresol = 6;
+ int_data.if_tsresol = file_int_data->if_tsresol;
int_data.if_filter_str = NULL;
int_data.bpf_filter_len = 0;
int_data.if_filter_bpf_bytes = NULL;