<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 TRANSITIONAL//EN">
<HTML>
<HEAD>
<META HTTP-EQUIV="Content-Type" CONTENT="text/html; CHARSET=UTF-8">
<META NAME="GENERATOR" CONTENT="GtkHTML/3.26.0">
</HEAD>
<BODY>
On Wed, 2011-03-16 at 11:58 +1000, Peter Hutterer wrote:<BR>
<BLOCKQUOTE TYPE=CITE>
<TT><FONT COLOR="#1a1a1a">for some reason 1/4 I get conflicts trying to apply 1/4 on current master</FONT></TT><BR>
<TT><FONT COLOR="#1a1a1a">(13baef91f0). not sure why though.</FONT></TT><BR>
</BLOCKQUOTE>
<BR>
I'll check it out, thanks.
</BODY>
</HTML>