compared with
Current by Fluid IRC Log Bot
on Jul 17, 2012 15:34.

Key
This line was removed.
This word was removed. This word was added.
This line was added.

Changes (1)

View Page History

\[14:32:32 CDT(-0500)\] {color:black} <jhung> justin_o: just pushed up changes to me repo that fixes the conflict. It was actually straight forward, not sure why Mercurial had problems with it. :/{color}

\[14:33:51 CDT(-0500)\] {color:black} <Justin_o> jhung: i don't know either.. merge conflicts in hg are just such a nightmare.. i'm also using a new vm image now so don't have any of the merge tools set up{color}

\[14:33:52 CDT(-0500)\] {color:black} <Justin_o> :({color}