Re: Merge conflicts abound

On 12/7/18 10:28 AM, Dave Longley wrote:
> And scroll to the bottom of the page, it will say:
> 
> "This branch has conflicts that must be resolved".

Note that you have to be signed into Github to see this.

-- manu

-- 
Manu Sporny (skype: msporny, twitter: manusporny, G+: +Manu Sporny)
Founder/CEO - Digital Bazaar, Inc.
blog: Veres One Decentralized Identifier Blockchain Launches
https://tinyurl.com/veres-one-launches

Received on Friday, 7 December 2018 15:31:26 UTC