On Thu, Oct 11, 2018 at 9:04 AM, Vasily <[email protected]> wrote:
> ... > P.S. Mike, I've noticed that you have probably missed one merge conflict > during rebase, here's quick-and-dirty diff I had to make: > $ git diff > diff --git a/Makefile.am b/Makefile.am > index 298e1a5e..a91293cf 100644 > --- a/Makefile.am > +++ b/Makefile.am > @@ -26,7 +26,6 @@ > ACLOCAL_AMFLAGS = -I m4 > > # Subprojects > -<<<<<<< HEAD > DIST_SUBDIRS = \ > src/libguac \ > src/common \ > Oops. I've re-rebased. - Mike
