From 008cdd5103dfa7c2e262cc1ba927e03d025edfb7 Mon Sep 17 00:00:00 2001 From: David Barroso Date: Thu, 1 Oct 2015 13:18:35 +0200 Subject: [PATCH] Update AUTHORS --- AUTHORS | 4 ---- 1 file changed, 4 deletions(-) diff --git a/AUTHORS b/AUTHORS index 775f066..f7323fc 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,6 +1,2 @@ David Barroso -<<<<<<< HEAD -Elisa Jasinska -======= Elisa Jasinska ->>>>>>> master