677149 - remove old Conflicts, doxygen BR (#225254)

Authored and Committed by jorton 17 years ago
    - remove old Conflicts, doxygen BR (#225254)
    
        
file modified
+5 -4