Merge conflict for /README.txt? Srsly, wtf?

2008-01-18 22:38:38 +00:00 · 2008-01-18 22:38:38 +00:00 · dcbf21c4a3
--- a/tools/tinderbox-configs/thunderbird/win32/CLOBBER
+++ b/tools/tinderbox-configs/thunderbird/win32/CLOBBER
@ -1 +1 @@
-CLOBBERing to persuade it that SVG is really enabled
+Clobber for -- get this -- merge conflict on /README.txt