Re: Missing ‘or’ in CLA

[Henri Yandell <flamefew@gmail.com>]

As patch text (sorry, was on a phone for the first email and forgot I could
generate the patch from GitHub via url):

>From 86403de1826e3bcf860497c69141b40082ec56a5 Mon Sep 17 00:00:00 2001
From: Henri Yandell <hyandell@users.noreply.github.com>
Date: Wed, 29 Aug 2018 22:31:39 -0700
Subject: [PATCH] Adding missing 'or'

When the CLA was created from the Apache ICLA, the option for a CCLA
was removed. When this was done the 'or' was lost in the text. This
puts it back in so that you represent that you have received
permission __or__ your employer has waived such rights.
---
 Contributions.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Contributions.txt b/Contributions.txt
index f34626912a4..7859435c175 100644
--- a/Contributions.txt
+++ b/Contributions.txt
@@ -201,7 +201,7 @@ title, and interest in and to Your Contributions.
   license. If your employer(s) has rights to intellectual property
   that You create that includes Your Contributions, You represent
   that You have received permission to make Contributions on behalf
-  of that employer, that Your employer has waived such rights for
+  of that employer or that Your employer has waived such rights for
   Your Contributions.
 * You represent that each of Your Contributions is Your original
   creation (see Section 4 for submissions on behalf of others).


On Fri, Aug 31, 2018 at 12:30 PM Laszlo Ersek <lersek@redhat.com> wrote:

> Mike,
>
> On 08/31/18 01:58, Henri Yandell wrote:
> > The CLA is missing an ‘or’ in section 3.
> >
> > See https://github.com/tianocore/edk2/pull/133/files for an example of
> the
> > specific text.
>
> could you please turn this report into a real patch (if the suggested
> change is valid)? Technically it's easy enough so I could do it as well,
> just so we have something to review on the list, but:
> - I have no idea if the suggested change is valid,
> - I wasn't around when "Contributions.txt" was originally invented.
>
> Thanks
> Laszlo
>