resolve merge conflicts

This commit is contained in:
Johann150 2021-01-27 22:00:28 +01:00
commit 46866c4320
No known key found for this signature in database
GPG key ID: 9EE6577A2A06F8F1
2 changed files with 213 additions and 157 deletions

View file

@ -84,7 +84,7 @@ impl FileOptions {
// discard any I/O errors
.filter_map(|line| line.ok())
// filter out comment lines
.filter(|line| !line.trim_start().starts_with("#"))
.filter(|line| !line.trim_start().starts_with('#'))
.for_each(|line| {
// split line at colon
let parts = line.splitn(2, ':').collect::<Vec<_>>();