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