444107c do not conflict on header file between architectures (#1180857)

Authored and Committed by tmraz 9 years ago
    do not conflict on header file between architectures (#1180857)
    
        
file modified
+6 -1