On 09/08/2013 09:47 PM, Phil Dibowitz wrote: > I'll merge it. Actually it doens't merge cleanly:
Applying: Add support for Harmony Link.
/home/phil/build/git/concordance/.git/rebase-apply/patch:76: trailing
whitespace.
# struct mh_wifi_network network[MH_MAX_WIFI_NETWORKS];
/home/phil/build/git/concordance/.git/rebase-apply/patch:316: trailing
whitespace.
struct mh_wifi_network network[MH_MAX_WIFI_NETWORKS];
/home/phil/build/git/concordance/.git/rebase-apply/patch:433: trailing
whitespace.
/*
error: patch failed: libconcord/remote.h:309
error: libconcord/remote.h: patch does not apply
error: patch failed: libconcord/remote_z.cpp:1486
error: libconcord/remote_z.cpp: patch does not apply
Patch failed at 0001 Add support for Harmony Link.
Wanna re-base (and nuke trailing whitespace)?
--
Phil Dibowitz p...@ipom.com
Open Source software and tech docs Insanity Palace of Metallica
http://www.phildev.net/ http://www.ipom.com/
"Be who you are and say what you feel, because those who mind don't matter
and those who matter don't mind."
- Dr. Seuss
signature.asc
Description: OpenPGP digital signature
------------------------------------------------------------------------------ Learn the latest--Visual Studio 2012, SharePoint 2013, SQL 2012, more! Discover the easy way to master current and previous Microsoft technologies and advance your career. Get an incredible 1,500+ hours of step-by-step tutorial videos with LearnDevNow. Subscribe today and save! http://pubads.g.doubleclick.net/gampad/clk?id=58041391&iu=/4140/ostg.clktrk
_______________________________________________ concordance-devel mailing list concordance-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/concordance-devel
