Fixes #4048 - Remove duplicate lines from wrong merge
Merge pull request #217 from nperron/bug_4048/int/fix_broken_reporting_of_git_lock_check

Fixes #4048 - Remove duplicate lines from wrong merge