Libby
3d3abb0a26
Merge pull request #571 from AttackCowboy/patch-1
Added my name and git username to index.html
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
Since we're usually just appending lines to the file, it might make
sense to tell git to merge the file as union and not omit lines
that were missing on the branch if master has had them added.
source:
https://krlmlr.github.io/using-gitattributes-to-avoid-merge-conflicts/
Text from git docs:
https://git-scm.com/docs/gitattributes
> Run 3-way file level merge for text files, but take lines from both
> versions, instead of leaving conflict markers. This tends to leave the
> added lines in the resulting file in random order and the user should
> verify the result. Do not use this if you do not understand the
> implications.
8 years ago
David Hartunian
e2823be026
Merge branch 'emceeaich-patch-1'
8 years ago
G. Ryan Sablosky
3f931f64c9
Merge pull request #100 from brkattk/master
Added Erik Straub
8 years ago
David Hartunian
3f38884c2d
Merge branch 'patch-1' of https://github.com/emceeaich/neveragaindottech.github.io into emceeaich-patch-1
8 years ago
G. Ryan Sablosky
73467beb23
Merge branch 'master' into master
8 years ago
David Hartunian
62716abac7
Merge pull request #156 from mearns/master
Add signature
8 years ago
David Hartunian
afe3e96591
Merge branch 'rpardee-master'
8 years ago
David Hartunian
cb696f7f60
Merge branch 'master' of https://github.com/rpardee/neveragaindottech.github.io into rpardee-master
8 years ago
G. Ryan Sablosky
a1b8ef8237
Merge pull request #105 from mikemorris/patch-1
Add Mike Morris
8 years ago
G. Ryan Sablosky
56f2441e35
Merge branch 'master' into patch-1
8 years ago
G. Ryan Sablosky
91c80c72d0
Merge pull request #106 from whereandy/master
Adding Andy Cheung
8 years ago
G. Ryan Sablosky
2d592cb43c
Merge branch 'master' into master
8 years ago
David Hartunian
e3c8a6bb89
Merge pull request #154 from benjaminjkraft/add-benkraft
Add Ben Kraft
8 years ago
David Hartunian
a184b4b9a3
Merge branch 'shellicious-patch-1'
8 years ago
David Hartunian
087df78b35
Merge branch 'patch-1' of https://github.com/shellicious/neveragaindottech.github.io into shellicious-patch-1
8 years ago
David Hartunian
337941ebe3
Merge branch 'rdebeasi-master'
8 years ago
G. Ryan Sablosky
7532b8cb97
Merge pull request #128 from jneen/patch-1
Cosign jneen
8 years ago
David Hartunian
b86a9e71ac
Merge branch 'master' of https://github.com/rdebeasi/neveragaindottech.github.io into rdebeasi-master
8 years ago
G. Ryan Sablosky
68b7511bf3
Merge pull request #127 from dotj/master
Added dotj's signature
8 years ago
G. Ryan Sablosky
0ce693ccdb
Merge pull request #126 from marclove/patch-2
Add Marc Love.
8 years ago
David Hartunian
68834c79cb
Merge pull request #150 from patrickod/patrickod/addition
Add Patrick O'Doherty to signatories list
8 years ago
G. Ryan Sablosky
e71a9a89a6
Merge pull request #124 from lamagnifica/patch-1
Added Alison Hodges (github lamagnifica)
8 years ago
David Hartunian
21e7f2d6d6
Merge branch 'edinc-master'
8 years ago
David Hartunian
113187ed8d
Merge branch 'master' of https://github.com/edinc/neveragaindottech.github.io into edinc-master
8 years ago
David Hartunian
5b00db7307
Merge branch 'aeschright-patch-1'
8 years ago
David Hartunian
217003188e
remove spaces
8 years ago
Libby
634e2a64ed
Update index.html
8 years ago
David Hartunian
6ea32ed986
Merge branch 'patch-1' of https://github.com/aeschright/neveragaindottech.github.io into aeschright-patch-1
8 years ago
Libby
5bcb7ef9cf
Update index.html
8 years ago
Libby
d2b15449d2
Update index.html
8 years ago
Shauna Gordon-McKeon
9e4fb7c126
Merge pull request #115 from davidw/master
Added davidw
8 years ago
Shauna Gordon-McKeon
8bfdfb9db2
Merge pull request #114 from seanedwards/patch-2
Add Sean T. Edwards
8 years ago
shaunagm
2bfce47961
Merge branch 'toddsiegel-toddsiegel-patch-1'
8 years ago
shaunagm
117cd91cf3
Fix merge conflict
8 years ago
shaunagm
12b528bece
Merge branch 'morganastra-master'
8 years ago
shaunagm
e2d4c40313
Fix merge conflict
8 years ago
Ben Kraft
a59e42b6a5
Add Ben Kraft
8 years ago
Shauna Gordon-McKeon
58f307cb90
Merge pull request #111 from louh/patch-2
add myself
8 years ago
Libby
4a23580ef4
Merge pull request #82 from daeken/master
Add Cody Brocious.
8 years ago
Shauna Gordon-McKeon
8158a2ea5c
Merge pull request #110 from girving/master
Add Geoffrey Irving
8 years ago
Libby
3f7b433db4
Merge pull request #77 from kkinder/patch-1
+Ken Kinder
8 years ago
Libby
c683607f15
Merge branch 'master' into patch-1
8 years ago
Brian Mearns
4c1866e58e
Update index.html
8 years ago
Libby
fe6b9ee247
Update index.html
8 years ago
Emma Humphries
d1555db5d0
Add Emma Humphries
8 years ago
Roy Pardee
72738c8561
Merge branch 'master' of github.com:rpardee/neveragaindottech.github.io
8 years ago
Shelly
03deb32cee
Update index.html
8 years ago
Ryan DeBeasi
44ca7315f8
Restore whitespace
8 years ago