Update AUTHORS

This commit is contained in:
David Barroso committed 2015-10-01 13:18:35 +02:00
1 parent 1af0d39b50
commit 008cdd5103
1 file changed
-4
-4
View File
@@ -1,6 +1,2 @@
David Barroso <dbarroso@spotify.com>
<<<<<<< HEAD
Elisa Jasinska <elisa@bigwaveit.org>
=======
Elisa Jasinska <elisa@bigwaveit.com>
>>>>>>> master