Augustin Cavalier wrote:
On Mon, Jan 19, 2015 at 8:57 PM,<jscipione@xxxxxxxxx> wrote: You knew that I was working on tracker_layout, is there a reason you needed to touch Tracker? Now I have merge conflicts to take care of :/
Sorry, I was fixing a bug as a followup to the Tracker changes I made a while back. The change should be small and self-contained so shouldn't cause any serious merge issues. Do you want me to revert until after you have merged Tracker Layout?