On Sat, Mar 28, 2009 at 5:47 AM, Elijah Newren <newren@xxxxxxxxx> wrote: > You can resolve this merge conflict by running > $ git rm TimeSheets/Timesheet\ Exempt.XLS Much appreciated! That works. Thanks for your and Nanako's help! bg -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
