Resolve conflict

2013-12-01 20:11:40 +00:00 · 2013-12-01 20:11:40 +00:00 · 6be7e2c30e
parent 7ebb8702b2 593503fe09
commit 6be7e2c30e
1 changed files with 2 additions and 0 deletions
--- a/licenses/cla-individual.md
+++ b/licenses/cla-individual.md
@ -120,3 +120,5 @@ Bob Robison, @grayeul, 2013/11/11
 Adrian Sampaleanu, @asampal, 2013/11/17

 David Jade, @davidjade, 2013/11/30
+
+Stephan Hradek, @Skeeve, 2013/11/30