On 4 July 2016 at 15:34, Emil Velikov <emil.l.veli...@gmail.com> wrote:
> diff --git a/shared/config-parser.c b/shared/config-parser.c > index 2256469..d316958 100644 > --- a/shared/config-parser.c > +++ b/shared/config-parser.c > @@ -39,6 +39,7 @@ > > #include <wayland-util.h> > #include "config-parser.h" > +#include "config-parser-priv.h" Git rebase failure. This hunk shouldn't be here. -Emil _______________________________________________ wayland-devel mailing list wayland-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/wayland-devel
