bba934e Remove merge conflict

Authored and Committed by peter 9 years ago
    Remove merge conflict
    
    Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
    
        
file modified
+0 -21