f51b7a8 drop ancient Conflicts, minor spec cleanups

Authored and Committed by pbrobinson 6 years ago
    drop ancient Conflicts, minor spec cleanups
    
        
file modified
+6 -14