526b9ee fix the golang-godoc conflict

Authored and Committed by Vincent Batts 10 years ago
    fix the golang-godoc conflict
    
        
file modified
+5 -1