svn commit: r1696685 - /accumulo/site/trunk/content/people.mdtext

[elserj]

Author: elserj
Date: Wed Aug 19 22:39:59 2015
New Revision: 1696685

URL: http://svn.apache.org/r1696685
Log:
Trying to resolve conflicts

Modified:
    accumulo/site/trunk/content/people.mdtext

Modified: accumulo/site/trunk/content/people.mdtext
URL: 
http://svn.apache.org/viewvc/accumulo/site/trunk/content/people.mdtext?rev=1696685&r1=1696684&r2=1696685&view=diff
==============================================================================
--- accumulo/site/trunk/content/people.mdtext (original)
+++ accumulo/site/trunk/content/people.mdtext Wed Aug 19 22:39:59 2015
@@ -44,7 +44,7 @@ PMC and Committers
   <tr><td>mdrob</td><td>Mike Drob</td><td><a 
href="http://www.cloudera.com";>Cloudera</a></td><td>ET (<a 
href=http://www.timeanddate.com/library/abbreviations/timezones/na/est.html>-5</a>
 / <a 
href=http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html>-4</a>)</td></tr>
   <tr><td>busbey</td><td>Sean Busbey</td><td><a 
href="http://www.cloudera.com";>Cloudera</a></td><td>CT (<a 
href=http://www.timeanddate.com/library/abbreviations/timezones/na/cst.html>-6</a>
 / <a 
href=http://www.timeanddate.com/library/abbreviations/timezones/na/cdt.html>-5</a>)</td></tr>
   <tr><td>shickey</td><td>Sean Hickey</td><td></td><td>PT (<a 
href=http://www.timeanddate.com/library/abbreviations/timezones/na/pst.html>-8</a>
 / <a 
href=http://www.timeanddate.com/library/abbreviations/timezones/na/pdt.html>-7</a>)</td></tr>
-  <tr><td>ujustgotbilld</td><td>William Slacum</td><td><a 
href="http://www.koverse.com";>Koverse</a></td><td>ET (<a 
href=http://www.timeanddate.com/library/abbreviations/timezones/na/est.html>-5</a>
 / <a 
href=http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html>-4</a>)</td></tr>
+  <tr><td>ujustgotbilld</td><td>William Slacum</td><td><a 
href="http://minerkasch.com/";>Miner &amp; Kasch</a></td><td>ET (<a 
href=http://www.timeanddate.com/library/abbreviations/timezones/na/est.html>-5</a>
 / <a 
href=http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html>-4</a>)</td></tr>
   <tr><td>vikrams</td><td>Vikram Srivastava</td><td><a 
href="http://www.cloudera.com";>Cloudera</a></td><td>PT (<a 
href=http://www.timeanddate.com/library/abbreviations/timezones/na/pst.html>-8</a>
 / <a 
href=http://www.timeanddate.com/library/abbreviations/timezones/na/pdt.html>-7</a>)</td></tr>
 </table>