resolve merge conflict in authors

This commit is contained in:
David Halter
2013-09-28 19:48:20 +04:30
6 changed files with 69 additions and 0 deletions
+1
View File
@@ -34,6 +34,7 @@ Wouter Overmeire (@lodagro) <lodagro@gmail.com>
Stephen J. Fuhry (@fuhrysteve) <fuhrysteve@gmail.com>
Sheng Yun (@ShengYun) <uewing@gmail.com>
Yann Thomas-Gérard (@inside) <inside@gmail.com>
Colin Su (@littleq0903) <littleq0903@gmail.com>
@something are github user names.