edent-gh/SuperTinyIcons
1
0
Fork 0
forked from edent/SuperTinyIcons
Code Pull Requests Activity

Solving conflicts

Browse Source
This commit is contained in:
arturoacevedob
2017-11-28 16:55:20 -06:00
parent 6d6b9cf521
commit b36b42d1b8
2 changed files with 1 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
images/svg/ubuntu.svg
View File

@@ -1,5 +1 @@
<<<<<<< HEAD
<svg fill="#e65e17" viewBox="0 0 512 512" xmlns="http://www.w3.org/2000/svg" aria-label="Ubuntu" role="img"><rect height="512" rx="15%" width="512"/><circle cx="263" cy="256" fill="#fff" r="158"/><circle cx="263" cy="256" r="104"/><circle cx="79" cy="257" r="50"/><circle cx="79" cy="257" fill="#fff" r="38"/><circle cx="356" cy="417" r="50"/><circle cx="356" cy="417" fill="#fff" r="38"/><circle cx="356" cy="96" r="50"/><circle cx="356" cy="96" fill="#fff" r="38"/><path d="M427 266v-20h-64v20zM173 392l18 10 32-55-18-10zm18-283l-18 11 32 55 18-10z"/></svg>
=======
<svg viewBox="0 0 512 512" xmlns="http://www.w3.org/2000/svg" aria-label="Ubuntu" role="img"><rect fill="#e65e17" height="512" rx="15%" width="512"/><circle cx="268" cy="256" fill="#fff" r="158"/><circle cx="268" cy="256" fill="#e65e17" r="104"/><circle cx="84" cy="257" fill="#e65e17" r="50"/><circle cx="84" cy="257" fill="#fff" r="38"/><circle cx="361" cy="417" fill="#e65e17" r="50"/><circle cx="361" cy="417" fill="#fff" r="38"/><circle cx="361" cy="96" fill="#e65e17" r="50"/><circle cx="361" cy="96" fill="#fff" r="38"/><path d="m432 266v-20h-64v20zm-254 126 18 10 32-55-18-10zm18-283-18 11 32 55 18-10z" fill="#e65e17"/></svg>
>>>>>>> edent/master
<svg fill="#e65e17" viewBox="0 0 512 512" xmlns="http://www.w3.org/2000/svg" aria-label="Ubuntu" role="img"><rect height="512" rx="15%" width="512"/><circle cx="263" cy="256" fill="#fff" r="158"/><circle cx="263" cy="256" r="104"/><circle cx="79" cy="257" r="50"/><circle cx="79" cy="257" fill="#fff" r="38"/><circle cx="356" cy="417" r="50"/><circle cx="356" cy="417" fill="#fff" r="38"/><circle cx="356" cy="96" r="50"/><circle cx="356" cy="96" fill="#fff" r="38"/><path d="M427 266v-20h-64v20zM173 392l18 10 32-55-18-10zm18-283l-18 11 32 55 18-10z"/></svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 559 B