a460f0e removed conflicts tag

Authored and Committed by Jiri Skala 12 years ago
1 file changed. 4 lines added. 2 lines removed.
    removed conflicts tag
    
        
file modified
+4 -2