On Sat, 28 Apr 2012 05:45:54 -0700, Stephan Gambke <[email protected]>
wrote:
Am 28.04.2012 14:43, schrieb Chad:
If you didn't touch them, then I don't know how
there would be a conflict.
Me neither. That's why I asked.
Will try to start over with a fresh clone.
Thanks anyway.
Cheers,
Stephan
What is the diff? By any chance do you still have svn attached?
--
~Daniel Friesen (Dantman, Nadir-Seen-Fire) [http://daniel.friesen.name]
_______________________________________________
Wikitech-l mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/wikitech-l
