On 24 March 2018 at 11:24, <[email protected]> wrote: > This is an automated email from the ASF dual-hosted git repository. > > curcuru pushed a commit to branch master > in repository https://gitbox.apache.org/repos/asf/whimsy.git > > commit 659e1a3b930063f0c38774e9b09e6ff2d2914521 > Merge: a75495f d606efa > Author: Shane Curcuru <[email protected]> > AuthorDate: Sat Mar 24 07:24:51 2018 -0400 > > Correct Brian McCallister initials
Comment does not agree with changes below ... > # Conflicts: > # www/members/board-attend.cgi > > www/members/board-attend.cgi | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) > > diff --cc www/members/board-attend.cgi > index 9b04230,2c3a9b4..379a407 > --- a/www/members/board-attend.cgi > +++ b/www/members/board-attend.cgi > @@@ -31,8 -30,8 +31,9 @@@ DIRECTOR_MAP = > 'isabel' => ['idf', 'Isabel', 'Isabel Drost-Fromm'], > 'jerenkrantz' => ['je', 'Justin', 'Justin Erenkrantz'], > 'jim' => ['jj', 'Jim', 'Jim Jagielski'], > + 'lrosen' => ['lr', 'Larry', 'Larry Rosen'], > 'ke4qqq' => ['dn', 'David', 'David Nalley'], > + 'lrosen' => ['lr', 'Lawrence', 'Lawrence Rosen'], > 'markt' => ['mt', 'Mark', 'Mark Thomas'], > 'marvin' => ['mh', 'Marvin', 'Marvin Humphrey'], > 'mattmann' => ['cm', 'Chris', 'Chris Mattmann'], > > -- > To stop receiving notification emails like this one, please contact > [email protected].
