fix: resolve merge conflicts

This commit is contained in:
Dashboard Icons Bot
2025-01-05 02:54:50 +00:00
committed by Bjorn Lammers
parent b560a099e9
commit 1dde587869
4944 changed files with 1635 additions and 73999 deletions

View File

@@ -1 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 548.3 400"><path fill="#4285F4" d="M477.4,0H153.2c-28.2,0-51.1,22.9-51.1,51.1v51.1h395.1c28.2,0,51.1,22.9,51.1,51.1V70.9 C548.3,31.7,516.6,0,477.4,0L477.4,0z"/><path fill="#34A853" d="M70.9,0C31.7,0,0,31.7,0,70.9v175.9c0,28.2,22.9,51.1,51.1,51.1h51.1V51.1c0,0,0,0,0,0 C102.2,22.9,125,0,153.2,0H70.9L70.9,0z"/><path fill="#FBBC04" d="M70.9,400h324.2c28.2,0,51.1-22.9,51.1-51.1v-51.1H51.1C22.9,297.8,0,275,0,246.8v82.3 C0,368.3,31.7,400,70.9,400L70.9,400z"/><path fill="#EA4335" d="M477.4,400c39.2,0,70.9-31.7,70.9-70.9V153.2c0-28.2-22.9-51.1-51.1-51.1h-51.1v246.8c0,0,0,0,0,0 c0,28.2-22.9,51.1-51.1,51.1H477.4L477.4,400z"/></svg>
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 548.3 400"><path fill="#4285F4" d="M477.4 0H153.2c-28.2 0-51.1 22.9-51.1 51.1v51.1h395.1c28.2 0 51.1 22.9 51.1 51.1V70.9c0-39.2-31.7-70.9-70.9-70.9"/><path fill="#34A853" d="M70.9 0C31.7 0 0 31.7 0 70.9v175.9c0 28.2 22.9 51.1 51.1 51.1h51.1V51.1c0-28.2 22.8-51.1 51-51.1z"/><path fill="#FBBC04" d="M70.9 400h324.2c28.2 0 51.1-22.9 51.1-51.1v-51.1H51.1C22.9 297.8 0 275 0 246.8v82.3C0 368.3 31.7 400 70.9 400"/><path fill="#EA4335" d="M477.4 400c39.2 0 70.9-31.7 70.9-70.9V153.2c0-28.2-22.9-51.1-51.1-51.1h-51.1v246.8c0 28.2-22.9 51.1-51.1 51.1z"/></svg>

Before

Width:  |  Height:  |  Size: 695 B

After

Width:  |  Height:  |  Size: 606 B