Skip to content
Snippets Groups Projects
Commit 80db8687 authored by Brian Carrier's avatar Brian Carrier
Browse files

resolve conflict

parents 3b6fa5ba 1f254d93
No related branches found
No related tags found
No related merge requests found
...@@ -122,6 +122,7 @@ tsk_vs_open(TSK_IMG_INFO * img_info, TSK_DADDR_T offset, ...@@ -122,6 +122,7 @@ tsk_vs_open(TSK_IMG_INFO * img_info, TSK_DADDR_T offset,
tsk_fprintf(stderr, tsk_fprintf(stderr,
"mm_open: Ignoring DOS Safety GPT Partition\n"); "mm_open: Ignoring DOS Safety GPT Partition\n");
prev_type = NULL; prev_type = NULL;
prev_vs->close(prev_vs);
prev_vs = NULL; prev_vs = NULL;
break; break;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment