From 1fa8595bffe4e1e86ec9c2c941ee6e271bbb4cf4 Mon Sep 17 00:00:00 2001 From: Danil Alexeev Date: Thu, 3 Dec 2020 18:01:18 +0300 Subject: [PATCH] Change logo in the About dialog box (return Godot's teeth) (cherry picked from commit c553ca54d5de4c9ce9ebdf1c416985a56f20a9a7) And fixup previous bogus cherry-pick that included merge conflicts. --- editor/icons/icon_logo.svg | 2 +- misc/dist/document_icons/project.svg | 4 - misc/dist/project_icon.svg | 143 +-------------------------- 3 files changed, 2 insertions(+), 147 deletions(-) diff --git a/editor/icons/icon_logo.svg b/editor/icons/icon_logo.svg index d7aef39cc94..a4ad488396c 100644 --- a/editor/icons/icon_logo.svg +++ b/editor/icons/icon_logo.svg @@ -1 +1 @@ - + diff --git a/misc/dist/document_icons/project.svg b/misc/dist/document_icons/project.svg index 759f79880dc..9b2644186a4 100644 --- a/misc/dist/document_icons/project.svg +++ b/misc/dist/document_icons/project.svg @@ -1,5 +1 @@ -<<<<<<< HEAD -PROJECT -======= PROJECT ->>>>>>> 17b9cb2cdf (Remove two very slightly displaced duplicate vertices on Gobot's face) diff --git a/misc/dist/project_icon.svg b/misc/dist/project_icon.svg index af381a49d6e..39a8cd63322 100644 --- a/misc/dist/project_icon.svg +++ b/misc/dist/project_icon.svg @@ -1,142 +1 @@ -<<<<<<< HEAD - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -======= - ->>>>>>> 17b9cb2cdf (Remove two very slightly displaced duplicate vertices on Gobot's face) +