From 6a84bcd82e8d3cbe5552ead6bcb9c0a5b2f3c664 Mon Sep 17 00:00:00 2001 From: Syed Faheel Ahmad Date: Tue, 24 Nov 2020 17:18:57 +0530 Subject: [PATCH] Fix merge conflict in Plataforma NEO's logo which seems to have been introduced in commit a6bf9fff23490ab4018ff8db7f321eefd61205ca --- .../webextension/images/icons/Plataforma NEO.svg | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/src/drivers/webextension/images/icons/Plataforma NEO.svg b/src/drivers/webextension/images/icons/Plataforma NEO.svg index 559ac6e48..2a9527aa2 100644 --- a/src/drivers/webextension/images/icons/Plataforma NEO.svg +++ b/src/drivers/webextension/images/icons/Plataforma NEO.svg @@ -1,16 +1,4 @@ -<<<<<<< HEAD -======= - - - - - - - - - ->>>>>>> dffac961239cb3ed09863b0431d3b758236ee62a