2b71e0b Remove merge artifacts.

Authored and Committed by Krzysztof Daniel 11 years ago
1 file changed. 4 lines added. 2 lines removed.
file modified
+4 -2