afda660 Fix git conflicts in spec.

Authored and Committed by hobbes1069 11 years ago
1 file changed. 0 lines added. 8 lines removed.
    Fix git conflicts in spec.
    
        
file modified
+0 -8