39ab20 Remove conflict for latest trace-cmd

Authored and Committed by Jerome Marchand 3 years ago
    Remove conflict for latest trace-cmd
    
        
file modified
+5 -2