diff --git a/editor/icons/icon_logo.svg b/editor/icons/icon_logo.svg index d7aef39cc9..a4ad488396 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 759f79880d..9b2644186a 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 af381a49d6..39a8cd6332 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) +