98eec83 Remove the generated conflicts from the sources file

Authored and Committed by Andrea Veri 10 years ago
1 file changed. 0 lines added. 4 lines removed.
    Remove the generated conflicts from the sources file
    
        
file modified
+0 -4