From 80916bed9f2050f59b9b36a088b93c545952fc67 Mon Sep 17 00:00:00 2001
From: Nahyun <tarea202001@gmail.com>
Date: Sun, 4 Feb 2024 16:01:42 +0900
Subject: [PATCH] =?UTF-8?q?Fix:=20svg=20icon=20=EC=B6=A9=EB=8F=8C=20?=
 =?UTF-8?q?=EC=98=A4=EB=A5=98=20=ED=95=B4=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/icons/back.svg               | 4 ----
 public/icons/collaborators_plus.svg | 2 ++
 public/icons/plus.svg               | 5 -----
 3 files changed, 2 insertions(+), 9 deletions(-)
 create mode 100644 public/icons/collaborators_plus.svg

diff --git a/public/icons/back.svg b/public/icons/back.svg
index 61596fba..8d74e91b 100644
--- a/public/icons/back.svg
+++ b/public/icons/back.svg
@@ -1,7 +1,3 @@
 <svg width="8" height="14" viewBox="0 0 8 14" fill="none" xmlns="http://www.w3.org/2000/svg">
-<<<<<<< HEAD
-<path d="M0.500012 7.80005L6.20001 13.4C6.60001 13.8 7.20001 13.8 7.60001 13.4C8.00001 13 8.00001 12.4 7.60001 12L2.70001 7.00005L7.60001 2.00005C8.00001 1.60005 8.00001 1.00005 7.60001 0.600049C7.40001 0.400049 7.20001 0.300049 6.90001 0.300049C6.60001 0.300049 6.40001 0.400049 6.20001 0.600049L0.500012 6.20005C0.100012 6.70005 0.100012 7.30005 0.500012 7.80005C0.500012 7.70005 0.500012 7.70005 0.500012 7.80005Z" fill="#1B1B1B"/>
-=======
 <path d="M0.499997 7.80005L6.2 13.4C6.6 13.8 7.2 13.8 7.6 13.4C8 13 8 12.4 7.6 12L2.7 7.00005L7.6 2.00005C8 1.60005 8 1.00005 7.6 0.600049C7.4 0.400049 7.2 0.300049 6.9 0.300049C6.6 0.300049 6.4 0.400049 6.2 0.600049L0.499997 6.20005C0.099997 6.70005 0.099997 7.30005 0.499997 7.80005C0.499997 7.70005 0.499997 7.70005 0.499997 7.80005Z" fill="#1B1B1B"/>
->>>>>>> 6a517f1030ec36d504181cba3c219bbbfd70f47f
 </svg>
diff --git a/public/icons/collaborators_plus.svg b/public/icons/collaborators_plus.svg
new file mode 100644
index 00000000..ff16d5db
--- /dev/null
+++ b/public/icons/collaborators_plus.svg
@@ -0,0 +1,2 @@
+<svg width="12" height="12" viewBox="0 0 12 12" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M11.25 5.25H6.75V0.75C6.75 0.551088 6.67098 0.360322 6.53033 0.21967C6.38968 0.0790178 6.19891 0 6 0C5.80109 0 5.61032 0.0790178 5.46967 0.21967C5.32902 0.360322 5.25 0.551088 5.25 0.75V5.25H0.75C0.551088 5.25 0.360322 5.32902 0.21967 5.46967C0.0790178 5.61032 0 5.80109 0 6C0 6.19891 0.0790178 6.38968 0.21967 6.53033C0.360322 6.67098 0.551088 6.75 0.75 6.75H5.25V11.25C5.25 11.4489 5.32902 11.6397 5.46967 11.7803C5.61032 11.921 5.80109 12 6 12C6.19891 12 6.38968 11.921 6.53033 11.7803C6.67098 11.6397 6.75 11.4489 6.75 11.25V6.75H11.25C11.4489 6.75 11.6397 6.67098 11.7803 6.53033C11.921 6.38968 12 6.19891 12 6C12 5.80109 11.921 5.61032 11.7803 5.46967C11.6397 5.32902 11.4489 5.25 11.25 5.25Z" fill="#DEE7EE"/>
\ No newline at end of file
diff --git a/public/icons/plus.svg b/public/icons/plus.svg
index ab8905f6..fa859916 100644
--- a/public/icons/plus.svg
+++ b/public/icons/plus.svg
@@ -1,8 +1,3 @@
-<<<<<<< HEAD
-<svg width="12" height="12" viewBox="0 0 12 12" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M11.25 5.25H6.75V0.75C6.75 0.551088 6.67098 0.360322 6.53033 0.21967C6.38968 0.0790178 6.19891 0 6 0C5.80109 0 5.61032 0.0790178 5.46967 0.21967C5.32902 0.360322 5.25 0.551088 5.25 0.75V5.25H0.75C0.551088 5.25 0.360322 5.32902 0.21967 5.46967C0.0790178 5.61032 0 5.80109 0 6C0 6.19891 0.0790178 6.38968 0.21967 6.53033C0.360322 6.67098 0.551088 6.75 0.75 6.75H5.25V11.25C5.25 11.4489 5.32902 11.6397 5.46967 11.7803C5.61032 11.921 5.80109 12 6 12C6.19891 12 6.38968 11.921 6.53033 11.7803C6.67098 11.6397 6.75 11.4489 6.75 11.25V6.75H11.25C11.4489 6.75 11.6397 6.67098 11.7803 6.53033C11.921 6.38968 12 6.19891 12 6C12 5.80109 11.921 5.61032 11.7803 5.46967C11.6397 5.32902 11.4489 5.25 11.25 5.25Z" fill="#DEE7EE"/>
-=======
 <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
 <path d="M19 11H13V5C13 4.73478 12.8946 4.48043 12.7071 4.29289C12.5196 4.10536 12.2652 4 12 4C11.7348 4 11.4804 4.10536 11.2929 4.29289C11.1054 4.48043 11 4.73478 11 5V11H5C4.73478 11 4.48043 11.1054 4.29289 11.2929C4.10536 11.4804 4 11.7348 4 12C4 12.2652 4.10536 12.5196 4.29289 12.7071C4.48043 12.8946 4.73478 13 5 13H11V19C11 19.2652 11.1054 19.5196 11.2929 19.7071C11.4804 19.8946 11.7348 20 12 20C12.2652 20 12.5196 19.8946 12.7071 19.7071C12.8946 19.5196 13 19.2652 13 19V13H19C19.2652 13 19.5196 12.8946 19.7071 12.7071C19.8946 12.5196 20 12.2652 20 12C20 11.7348 19.8946 11.4804 19.7071 11.2929C19.5196 11.1054 19.2652 11 19 11Z" fill="white"/>
->>>>>>> 6a517f1030ec36d504181cba3c219bbbfd70f47f
 </svg>