fix: add git merge icon

justdlabs · Nov 13, 2024 · edf6078 · edf6078
1 parent acb03d9
commit edf6078
Show file tree

Hide file tree

Showing 6 changed files with 74 additions and 2 deletions.
diff --git a/dist/cjs/index.js b/dist/cjs/index.js
@@ -11719,6 +11719,23 @@ const SvgIconGiroCards = props => /*#__PURE__*/React__namespace.createElement("s
   d: "M17.25 8.75h3a1 1 0 0 1 1 1v8.5a1 1 0 0 1-1 1H7.75a1 1 0 0 1-1-1v-3m0-6.5h1.5m-4.5 6.5h12.5a1 1 0 0 0 1-1v-8.5a1 1 0 0 0-1-1H3.75a1 1 0 0 0-1 1v8.5a1 1 0 0 0 1 1"
 }));
 
+const SvgIconGitMerge = props => /*#__PURE__*/React__namespace.createElement("svg", _extends({
+  xmlns: "http://www.w3.org/2000/svg",
+  width: 24,
+  height: 24,
+  fill: "none",
+  viewBox: "0 0 24 25"
+}, props, {
+  className: `justd-icons ${props.className ? props.className : "size-4"}`,
+  "data-slot": "icon",
+  "aria-hidden": "true"
+}), /*#__PURE__*/React__namespace.createElement("path", {
+  stroke: "currentColor",
+  strokeLinecap: "round",
+  strokeLinejoin: "round",
+  d: "M15 18.75a3 3 0 1 0 6 0 3 3 0 0 0-6 0m0 0a9 9 0 0 1-9-9m0 0a3 3 0 1 0 0-6 3 3 0 0 0 0 6m0 0v12"
+}));
+
 const SvgIconGlassesFill = props => /*#__PURE__*/React__namespace.createElement("svg", _extends({
   xmlns: "http://www.w3.org/2000/svg",
   width: 24,
@@ -21731,6 +21748,7 @@ exports.IconGiroCard = SvgIconGiroCard;
 exports.IconGiroCardFill = SvgIconGiroCardFill;
 exports.IconGiroCards = SvgIconGiroCards;
 exports.IconGiroCardsFill = SvgIconGiroCardsFill;
+exports.IconGitMerge = SvgIconGitMerge;
 exports.IconGlasses = SvgIconGlasses;
 exports.IconGlassesFill = SvgIconGlassesFill;
 exports.IconGlobe = SvgIconGlobe;

diff --git a/dist/es/index.js b/dist/es/index.js
diff --git a/dist/esm/index.js b/dist/esm/index.js
diff --git a/dist/index.d.ts b/dist/index.d.ts
@@ -661,6 +661,7 @@ export declare const IconGiroCard: React.FC<React.SVGProps<SVGSVGElement>>;
 export declare const IconGiroCardFill: React.FC<React.SVGProps<SVGSVGElement>>;
 export declare const IconGiroCards: React.FC<React.SVGProps<SVGSVGElement>>;
 export declare const IconGiroCardsFill: React.FC<React.SVGProps<SVGSVGElement>>;
+export declare const IconGitMerge: React.FC<React.SVGProps<SVGSVGElement>>;
 export declare const IconGlasses: React.FC<React.SVGProps<SVGSVGElement>>;
 export declare const IconGlassesFill: React.FC<React.SVGProps<SVGSVGElement>>;
 export declare const IconGlobe: React.FC<React.SVGProps<SVGSVGElement>>;

diff --git a/dist/umd/index.js b/dist/umd/index.js
@@ -11720,6 +11720,23 @@
     d: "M17.25 8.75h3a1 1 0 0 1 1 1v8.5a1 1 0 0 1-1 1H7.75a1 1 0 0 1-1-1v-3m0-6.5h1.5m-4.5 6.5h12.5a1 1 0 0 0 1-1v-8.5a1 1 0 0 0-1-1H3.75a1 1 0 0 0-1 1v8.5a1 1 0 0 0 1 1"
   }));
 
+  const SvgIconGitMerge = props => /*#__PURE__*/React__namespace.createElement("svg", _extends({
+    xmlns: "http://www.w3.org/2000/svg",
+    width: 24,
+    height: 24,
+    fill: "none",
+    viewBox: "0 0 24 25"
+  }, props, {
+    className: `justd-icons ${props.className ? props.className : "size-4"}`,
+    "data-slot": "icon",
+    "aria-hidden": "true"
+  }), /*#__PURE__*/React__namespace.createElement("path", {
+    stroke: "currentColor",
+    strokeLinecap: "round",
+    strokeLinejoin: "round",
+    d: "M15 18.75a3 3 0 1 0 6 0 3 3 0 0 0-6 0m0 0a9 9 0 0 1-9-9m0 0a3 3 0 1 0 0-6 3 3 0 0 0 0 6m0 0v12"
+  }));
+
   const SvgIconGlassesFill = props => /*#__PURE__*/React__namespace.createElement("svg", _extends({
     xmlns: "http://www.w3.org/2000/svg",
     width: 24,
@@ -21732,6 +21749,7 @@
   exports.IconGiroCardFill = SvgIconGiroCardFill;
   exports.IconGiroCards = SvgIconGiroCards;
   exports.IconGiroCardsFill = SvgIconGiroCardsFill;
+  exports.IconGitMerge = SvgIconGitMerge;
   exports.IconGlasses = SvgIconGlasses;
   exports.IconGlassesFill = SvgIconGlassesFill;
   exports.IconGlobe = SvgIconGlobe;

diff --git a/src/index.js b/src/index.js
@@ -660,6 +660,7 @@ export { default as IconGiroCardFill } from "./IconGiroCardFill";
 export { default as IconGiroCard } from "./IconGiroCard";
 export { default as IconGiroCardsFill } from "./IconGiroCardsFill";
 export { default as IconGiroCards } from "./IconGiroCards";
+export { default as IconGitMerge } from "./IconGitMerge";
 export { default as IconGlassesFill } from "./IconGlassesFill";
 export { default as IconGlasses } from "./IconGlasses";
 export { default as IconGlobe2Fill } from "./IconGlobe2Fill";