f2fab19 rm merge artifacts

Authored and Committed by ktdreyer 12 years ago
    rm merge artifacts
    
    These files were an artifact of merging all the branches
    together in git.
    
        
file removed
-11
file removed
-175