a967543 Fix typo in merge patch

Authored and Committed by nickc 5 years ago
    Fix typo in merge patch
    
        
file modified
+4 -1