5467f76 Fix conflitting doc files

Authored and Committed by Fabio Alessandro Locati 9 years ago
    Fix conflitting doc files
    
        
file modified
+10 -3