From b36b42d1b863324486226309f4093ef70d7d0cb5 Mon Sep 17 00:00:00 2001
From: arturoacevedob <arturoacevedob@gmail.com>
Date: Tue, 28 Nov 2017 16:55:20 -0600
Subject: [PATCH] Solving conflicts

---
 images/svg/apple.svg  | 8 --------
 images/svg/ubuntu.svg | 6 +-----
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/images/svg/apple.svg b/images/svg/apple.svg
index e9bf8b24..d40a55ac 100644
--- a/images/svg/apple.svg
+++ b/images/svg/apple.svg
@@ -1,9 +1 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
 <svg xmlns="http://www.w3.org/2000/svg" aria-label="Apple" role="img" viewBox="0 0 512 512"><rect width="512" height="512" fill="#666" rx="15%"/><path d="M400 352c-11 26-28 49-47 68-9 10-22 15-35 16-7 0-18-3-31-8-21-9-46-9-67 0-13 5-22 8-31 8-11 1-22-5-34-16-43-41-68-99-69-159 0-26 5-48 17-66 18-29 48-47 81-48 9 0 22 3 37 8 14 6 23 9 28 9 4 0 14-4 31-10s33-9 43-8c33 3 56 15 73 38a80 80 0 0 0-42 73c-1 33 19 64 52 77zM326 64c0 19-7 36-20 53-18 19-38 31-60 29v-8c3-43 36-78 79-82z" fill="#fff"/></svg>
-=======
-<svg viewBox="0 0 512 512" xmlns="http://www.w3.org/2000/svg" aria-label="Apple" role="img"><rect height="512" rx="15%" width="512"/><path d="m419 349c-12 28-29 52-50 73a54 54 0 0 1 -36 16c-9 0-20-3-33-8a91 91 0 0 0 -72 0c-13 5-23 8-32 8-12 1-24-5-36-16-46-44-72-105-73-169 0-27 5-51 18-70 18-31 50-50 86-51 9 0 22 3 38 9s25 9 30 9c4 0 15-4 33-10 18-7 34-10 46-9 34 3 59 16 77 41a85 85 0 0 0 -45 76 85 85 0 0 0 55 82zm-78-305c0 20-7 39-22 56-18 21-40 33-63 31v-8a93 93 0 0 1 84-87z" fill="#fff"/></svg>
->>>>>>> edent/master
-=======
-<svg xmlns="http://www.w3.org/2000/svg" aria-label="Amazon" role="img" viewBox="0 0 512 512"><rect width="512" height="512" fill="#666" rx="15%"/><path d="M400 352c-11 26-28 49-47 68-9 10-22 15-35 16-7 0-18-3-31-8-21-9-46-9-67 0-13 5-22 8-31 8-11 1-22-5-34-16-43-41-68-99-69-159 0-26 5-48 17-66 18-29 48-47 81-48 9 0 22 3 37 8 14 6 23 9 28 9 4 0 14-4 31-10s33-9 43-8c33 3 56 15 73 38a80 80 0 0 0-42 73c-1 33 19 64 52 77zM326 64c0 19-7 36-20 53-18 19-38 31-60 29v-8c3-43 36-78 79-82z" fill="#fff"/></svg>
->>>>>>> parent of 6717ce0... Update
diff --git a/images/svg/ubuntu.svg b/images/svg/ubuntu.svg
index d2548f20..88babc5f 100644
--- a/images/svg/ubuntu.svg
+++ b/images/svg/ubuntu.svg
@@ -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>
\ No newline at end of file