hardcoresushi
/
libcryfs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix merge conflict

This commit is contained in:
Sebastian Meßmer 2019-01-30 15:57:13 -08:00 committed by GitHub
parent 97a264a33a
commit d3ba6d1c39
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/stats/main.cpp
View File

@ -164,7 +164,7 @@ int main(int argc, char* argv[]) {
// TODO Show more info about error
throw std::runtime_error("Error loading config file.");
}
const auto& config_ = config->configFile.config();
const auto& config_ = config->configFile->config();
std::cout << "Loading filesystem of version " << config_->Version() << std::endl;
#ifndef CRYFS_NO_COMPATIBILITY
const bool is_correct_format = config_->Version() == CryConfig::FilesystemFormatVersion && !config_->HasParentPointers() && !config_->HasVersionNumbers();