Skip to content

Commit

Permalink
Update AUTHORS
Browse files Browse the repository at this point in the history
  • Loading branch information
@dbarrosop
dbarrosop committed Oct 1, 2015
1 parent 1318008 commit 8ab86a2
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions AUTHORS
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,2 @@
David Barroso <dbarroso@spotify.com>
<<<<<<< HEAD
Elisa Jasinska <elisa@bigwaveit.org>
=======
Elisa Jasinska <elisa@bigwaveit.com>
>>>>>>> master

0 comments on commit 8ab86a2

Please sign in to comment.