Compare commits

...

Author SHA1 Message Date
  Libby 3d3abb0a26 Merge pull request #571 from AttackCowboy/patch-1 8 years ago
  David Nielsen de548f70e3 Added my name and git username to index.html 8 years ago
  David Hartunian 277c574b25 Set merge=union on index.html 8 years ago
2 changed files with 2 additions and 0 deletions
Split View
  1. +1
    -0
      .gitattributes
  2. +1
    -0
      index.html

+ 1
- 0
.gitattributes View File

@ -0,0 +1 @@
./index.html merge=union

+ 1
- 0
index.html View File

@ -159,6 +159,7 @@ and are not intended to imply an endorsement by the organization.
<li>David Beckley
<li><a href="https://twitter.com/davigoli">David Golightly, Software Developer, Substantial</a>
<li>David Hartunian, Position Development <!-- from GitHub user dhartunian -->
<li>David Nielsen <!-- from GitHub user attackcowboy -->
<li>David Reid, Engineer, Fig <!-- from GitHub user dreid -->
<li><a href="http://twitter.com/davidnwelton">David Welton</a></li> <!-- from Github user davidw -->
<li>Don Marti, Mozilla <!-- from GitHub user dmarti -->


Loading…
Cancel
Save