592f2ca fix merge conflict

Merged and Committed by Mamoru Tasaka 8 years ago
    fix merge conflict
    
        
file modified
+11 -2