@central-icons-react-native/square-filled-radius-0-stroke-1.5 1.1.148 → 1.1.149

package/IconMergeConflict/index.d.ts

@@ -0,0 +1,4 @@
+import { FC } from "react";
+import { type CentralIconBaseProps } from "../CentralIconBase";
+export declare const IconMergeConflict: FC<CentralIconBaseProps>;
+export default IconMergeConflict;

package/IconMergeConflict/index.js

@@ -0,0 +1,2 @@
+"use strict";var i=Object.create;var C=Object.defineProperty;var u=Object.getOwnPropertyDescriptor;var B=Object.getOwnPropertyNames;var I=Object.getPrototypeOf,g=Object.prototype.hasOwnProperty;var x=(r,o)=>{for(var t in o)C(r,t,{get:o[t],enumerable:!0})},a=(r,o,t,l)=>{if(o&&typeof o=="object"||typeof o=="function")for(let e of B(o))!g.call(r,e)&&e!==t&&C(r,e,{get:()=>o[e],enumerable:!(l=u(o,e))||l.enumerable});return r};var f=(r,o,t)=>(t=r!=null?i(I(r)):{},a(o||!r||!r.__esModule?C(t,"default",{value:r,enumerable:!0}):t,r)),P=r=>a(C({},"__esModule",{value:!0}),r);var v={};x(v,{IconMergeConflict:()=>c,default:()=>d});module.exports=P(v);var n=f(require("react"));var m=f(require("react")),s=require("react-native-svg"),L=({children:r,size:o=24,...t})=>m.default.createElement(s.Svg,{...t,width:typeof o=="number"?`${o}px`:o,height:typeof o=="number"?`${o}px`:o,viewBox:"0 0 24 24",fill:"none"},r);var p=require("react-native-svg"),c=r=>n.default.createElement(L,{...r},n.default.createElement(p.Path,{d:"M6.75 15.0977C8.04354 15.431 9 16.6024 9 18C9 19.6569 7.65685 21 6 21C4.34315 21 3 19.6569 3 18C3 16.6024 3.95647 15.431 5.25 15.0977V10H6.75V15.0977Z",fill:"currentColor"}),n.default.createElement(p.Path,{d:"M18.75 15.0977C20.0435 15.431 21 16.6024 21 18C21 19.6569 19.6569 21 18 21C16.3431 21 15 19.6569 15 18C15 16.6024 15.9565 15.431 17.25 15.0977V6.75H10V5.25H18.75V15.0977Z",fill:"currentColor"}),n.default.createElement(p.Path,{d:"M9.06055 4L7.06055 6L9.06055 8L8 9.06055L6 7.06055L4 9.06055L2.93945 8L4.93945 6L2.93945 4L4 2.93945L6 4.93945L8 2.93945L9.06055 4Z",fill:"currentColor"})),d=c;0&&(module.exports={IconMergeConflict});
+//# sourceMappingURL=index.js.map

package/IconMergeConflict/index.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/IconMergeConflict/index.tsx","../src/CentralIconBase/index.tsx"],"sourcesContent":["import React, { FC } from \"react\";\nimport { CentralIconBase, type CentralIconBaseProps } from \"../CentralIconBase\";\nimport { Path } from \"react-native-svg\";\n\nexport const IconMergeConflict: FC<CentralIconBaseProps> = (props) => {\n  return (\n    <CentralIconBase {...props}>\n      <Path\n        d=\"M6.75 15.0977C8.04354 15.431 9 16.6024 9 18C9 19.6569 7.65685 21 6 21C4.34315 21 3 19.6569 3 18C3 16.6024 3.95647 15.431 5.25 15.0977V10H6.75V15.0977Z\"\n        fill=\"currentColor\"\n      />\n      <Path\n        d=\"M18.75 15.0977C20.0435 15.431 21 16.6024 21 18C21 19.6569 19.6569 21 18 21C16.3431 21 15 19.6569 15 18C15 16.6024 15.9565 15.431 17.25 15.0977V6.75H10V5.25H18.75V15.0977Z\"\n        fill=\"currentColor\"\n      />\n      <Path\n        d=\"M9.06055 4L7.06055 6L9.06055 8L8 9.06055L6 7.06055L4 9.06055L2.93945 8L4.93945 6L2.93945 4L4 2.93945L6 4.93945L8 2.93945L9.06055 4Z\"\n        fill=\"currentColor\"\n      />\n    </CentralIconBase>\n  );\n};\n\nexport default IconMergeConflict;\n","import React, { FC } from \"react\";\nimport { Svg, SvgProps } from \"react-native-svg\";\n\nexport type CentralIconBaseProps = {\n  size?: string | number;\n} & SvgProps;\n\nexport const CentralIconBase: FC<CentralIconBaseProps> = ({\n  children,\n  size = 24,\n  ...props\n}) => {\n  return (\n    <Svg\n      {...props}\n      width={typeof size === \"number\" ? `${size}px` : size}\n      height={typeof size === \"number\" ? `${size}px` : size}\n      viewBox=\"0 0 24 24\"\n      fill=\"none\"\n    >\n      {children}\n    </Svg>\n  );\n};\n"],"mappings":"0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,uBAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GAAA,IAAAK,EAA0B,oBCA1B,IAAAC,EAA0B,oBAC1BC,EAA8B,4BAMjBC,EAA4C,CAAC,CACxD,SAAAC,EACA,KAAAC,EAAO,GACP,GAAGC,CACL,IAEI,EAAAC,QAAA,cAAC,OACE,GAAGD,EACJ,MAAO,OAAOD,GAAS,SAAW,GAAGA,CAAI,KAAOA,EAChD,OAAQ,OAAOA,GAAS,SAAW,GAAGA,CAAI,KAAOA,EACjD,QAAQ,YACR,KAAK,QAEJD,CACH,EDnBJ,IAAAI,EAAqB,4BAERC,EAA+CC,GAExD,EAAAC,QAAA,cAACC,EAAA,CAAiB,GAAGF,GACnB,EAAAC,QAAA,cAAC,QACC,EAAE,yJACF,KAAK,eACP,EACA,EAAAA,QAAA,cAAC,QACC,EAAE,6KACF,KAAK,eACP,EACA,EAAAA,QAAA,cAAC,QACC,EAAE,sIACF,KAAK,eACP,CACF,EAIGE,EAAQJ","names":["IconMergeConflict_exports","__export","IconMergeConflict","IconMergeConflict_default","__toCommonJS","import_react","import_react","import_react_native_svg","CentralIconBase","children","size","props","React","import_react_native_svg","IconMergeConflict","props","React","CentralIconBase","IconMergeConflict_default"]}

package/IconMergeConflict/index.mjs

@@ -0,0 +1,2 @@
+import o from"react";import p from"react";import{Svg as l}from"react-native-svg";var n=({children:t,size:r=24,...C})=>p.createElement(l,{...C,width:typeof r=="number"?`${r}px`:r,height:typeof r=="number"?`${r}px`:r,viewBox:"0 0 24 24",fill:"none"},t);import{Path as e}from"react-native-svg";var a=t=>o.createElement(n,{...t},o.createElement(e,{d:"M6.75 15.0977C8.04354 15.431 9 16.6024 9 18C9 19.6569 7.65685 21 6 21C4.34315 21 3 19.6569 3 18C3 16.6024 3.95647 15.431 5.25 15.0977V10H6.75V15.0977Z",fill:"currentColor"}),o.createElement(e,{d:"M18.75 15.0977C20.0435 15.431 21 16.6024 21 18C21 19.6569 19.6569 21 18 21C16.3431 21 15 19.6569 15 18C15 16.6024 15.9565 15.431 17.25 15.0977V6.75H10V5.25H18.75V15.0977Z",fill:"currentColor"}),o.createElement(e,{d:"M9.06055 4L7.06055 6L9.06055 8L8 9.06055L6 7.06055L4 9.06055L2.93945 8L4.93945 6L2.93945 4L4 2.93945L6 4.93945L8 2.93945L9.06055 4Z",fill:"currentColor"})),g=a;export{a as IconMergeConflict,g as default};
+//# sourceMappingURL=index.mjs.map

package/IconMergeConflict/index.mjs.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/IconMergeConflict/index.tsx","../src/CentralIconBase/index.tsx"],"sourcesContent":["import React, { FC } from \"react\";\nimport { CentralIconBase, type CentralIconBaseProps } from \"../CentralIconBase\";\nimport { Path } from \"react-native-svg\";\n\nexport const IconMergeConflict: FC<CentralIconBaseProps> = (props) => {\n  return (\n    <CentralIconBase {...props}>\n      <Path\n        d=\"M6.75 15.0977C8.04354 15.431 9 16.6024 9 18C9 19.6569 7.65685 21 6 21C4.34315 21 3 19.6569 3 18C3 16.6024 3.95647 15.431 5.25 15.0977V10H6.75V15.0977Z\"\n        fill=\"currentColor\"\n      />\n      <Path\n        d=\"M18.75 15.0977C20.0435 15.431 21 16.6024 21 18C21 19.6569 19.6569 21 18 21C16.3431 21 15 19.6569 15 18C15 16.6024 15.9565 15.431 17.25 15.0977V6.75H10V5.25H18.75V15.0977Z\"\n        fill=\"currentColor\"\n      />\n      <Path\n        d=\"M9.06055 4L7.06055 6L9.06055 8L8 9.06055L6 7.06055L4 9.06055L2.93945 8L4.93945 6L2.93945 4L4 2.93945L6 4.93945L8 2.93945L9.06055 4Z\"\n        fill=\"currentColor\"\n      />\n    </CentralIconBase>\n  );\n};\n\nexport default IconMergeConflict;\n","import React, { FC } from \"react\";\nimport { Svg, SvgProps } from \"react-native-svg\";\n\nexport type CentralIconBaseProps = {\n  size?: string | number;\n} & SvgProps;\n\nexport const CentralIconBase: FC<CentralIconBaseProps> = ({\n  children,\n  size = 24,\n  ...props\n}) => {\n  return (\n    <Svg\n      {...props}\n      width={typeof size === \"number\" ? `${size}px` : size}\n      height={typeof size === \"number\" ? `${size}px` : size}\n      viewBox=\"0 0 24 24\"\n      fill=\"none\"\n    >\n      {children}\n    </Svg>\n  );\n};\n"],"mappings":"AAAA,OAAOA,MAAmB,QCA1B,OAAOC,MAAmB,QAC1B,OAAS,OAAAC,MAAqB,mBAMvB,IAAMC,EAA4C,CAAC,CACxD,SAAAC,EACA,KAAAC,EAAO,GACP,GAAGC,CACL,IAEIL,EAAA,cAACC,EAAA,CACE,GAAGI,EACJ,MAAO,OAAOD,GAAS,SAAW,GAAGA,CAAI,KAAOA,EAChD,OAAQ,OAAOA,GAAS,SAAW,GAAGA,CAAI,KAAOA,EACjD,QAAQ,YACR,KAAK,QAEJD,CACH,EDnBJ,OAAS,QAAAG,MAAY,mBAEd,IAAMC,EAA+CC,GAExDC,EAAA,cAACC,EAAA,CAAiB,GAAGF,GACnBC,EAAA,cAACH,EAAA,CACC,EAAE,yJACF,KAAK,eACP,EACAG,EAAA,cAACH,EAAA,CACC,EAAE,6KACF,KAAK,eACP,EACAG,EAAA,cAACH,EAAA,CACC,EAAE,sIACF,KAAK,eACP,CACF,EAIGK,EAAQJ","names":["React","React","Svg","CentralIconBase","children","size","props","Path","IconMergeConflict","props","React","CentralIconBase","IconMergeConflict_default"]}

package/IconMerged/index.d.ts

@@ -0,0 +1,4 @@
+import { FC } from "react";
+import { type CentralIconBaseProps } from "../CentralIconBase";
+export declare const IconMerged: FC<CentralIconBaseProps>;
+export default IconMerged;

package/IconMerged/index.js

@@ -0,0 +1,2 @@
+"use strict";var I=Object.create;var n=Object.defineProperty;var g=Object.getOwnPropertyDescriptor;var i=Object.getOwnPropertyNames;var u=Object.getPrototypeOf,x=Object.prototype.hasOwnProperty;var P=(r,o)=>{for(var e in o)n(r,e,{get:o[e],enumerable:!0})},a=(r,o,e,p)=>{if(o&&typeof o=="object"||typeof o=="function")for(let t of i(o))!x.call(r,t)&&t!==e&&n(r,t,{get:()=>o[t],enumerable:!(p=g(o,t))||p.enumerable});return r};var l=(r,o,e)=>(e=r!=null?I(u(r)):{},a(o||!r||!r.__esModule?n(e,"default",{value:r,enumerable:!0}):e,r)),v=r=>a(n({},"__esModule",{value:!0}),r);var h={};P(h,{IconMerged:()=>B,default:()=>d});module.exports=v(h);var C=l(require("react"));var m=l(require("react")),s=require("react-native-svg"),c=({children:r,size:o=24,...e})=>m.default.createElement(s.Svg,{...e,width:typeof o=="number"?`${o}px`:o,height:typeof o=="number"?`${o}px`:o,viewBox:"0 0 24 24",fill:"none"},r);var f=require("react-native-svg"),B=r=>C.default.createElement(c,{...r},C.default.createElement(f.Path,{d:"M6 3C7.39761 3 8.56905 3.95647 8.90234 5.25H18.75V15.0977C20.0435 15.431 21 16.6024 21 18C21 19.6569 19.6569 21 18 21C16.3431 21 15 19.6569 15 18C15 16.6024 15.9565 15.431 17.25 15.0977V6.75H8.90234C8.63089 7.80351 7.80348 8.62983 6.75 8.90137V15.0977C8.04354 15.431 9 16.6024 9 18C9 19.6569 7.65685 21 6 21C4.34315 21 3 19.6569 3 18C3 16.6024 3.95647 15.431 5.25 15.0977V8.90137C3.95658 8.56799 3 7.39752 3 6C3 4.34315 4.34315 3 6 3Z",fill:"currentColor"})),d=B;0&&(module.exports={IconMerged});
+//# sourceMappingURL=index.js.map

package/IconMerged/index.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/IconMerged/index.tsx","../src/CentralIconBase/index.tsx"],"sourcesContent":["import React, { FC } from \"react\";\nimport { CentralIconBase, type CentralIconBaseProps } from \"../CentralIconBase\";\nimport { Path } from \"react-native-svg\";\n\nexport const IconMerged: FC<CentralIconBaseProps> = (props) => {\n  return (\n    <CentralIconBase {...props}>\n      <Path\n        d=\"M6 3C7.39761 3 8.56905 3.95647 8.90234 5.25H18.75V15.0977C20.0435 15.431 21 16.6024 21 18C21 19.6569 19.6569 21 18 21C16.3431 21 15 19.6569 15 18C15 16.6024 15.9565 15.431 17.25 15.0977V6.75H8.90234C8.63089 7.80351 7.80348 8.62983 6.75 8.90137V15.0977C8.04354 15.431 9 16.6024 9 18C9 19.6569 7.65685 21 6 21C4.34315 21 3 19.6569 3 18C3 16.6024 3.95647 15.431 5.25 15.0977V8.90137C3.95658 8.56799 3 7.39752 3 6C3 4.34315 4.34315 3 6 3Z\"\n        fill=\"currentColor\"\n      />\n    </CentralIconBase>\n  );\n};\n\nexport default IconMerged;\n","import React, { FC } from \"react\";\nimport { Svg, SvgProps } from \"react-native-svg\";\n\nexport type CentralIconBaseProps = {\n  size?: string | number;\n} & SvgProps;\n\nexport const CentralIconBase: FC<CentralIconBaseProps> = ({\n  children,\n  size = 24,\n  ...props\n}) => {\n  return (\n    <Svg\n      {...props}\n      width={typeof size === \"number\" ? `${size}px` : size}\n      height={typeof size === \"number\" ? `${size}px` : size}\n      viewBox=\"0 0 24 24\"\n      fill=\"none\"\n    >\n      {children}\n    </Svg>\n  );\n};\n"],"mappings":"0jBAAA,IAAAA,EAAA,GAAAC,EAAAD,EAAA,gBAAAE,EAAA,YAAAC,IAAA,eAAAC,EAAAJ,GAAA,IAAAK,EAA0B,oBCA1B,IAAAC,EAA0B,oBAC1BC,EAA8B,4BAMjBC,EAA4C,CAAC,CACxD,SAAAC,EACA,KAAAC,EAAO,GACP,GAAGC,CACL,IAEI,EAAAC,QAAA,cAAC,OACE,GAAGD,EACJ,MAAO,OAAOD,GAAS,SAAW,GAAGA,CAAI,KAAOA,EAChD,OAAQ,OAAOA,GAAS,SAAW,GAAGA,CAAI,KAAOA,EACjD,QAAQ,YACR,KAAK,QAEJD,CACH,EDnBJ,IAAAI,EAAqB,4BAERC,EAAwCC,GAEjD,EAAAC,QAAA,cAACC,EAAA,CAAiB,GAAGF,GACnB,EAAAC,QAAA,cAAC,QACC,EAAE,qbACF,KAAK,eACP,CACF,EAIGE,EAAQJ","names":["IconMerged_exports","__export","IconMerged","IconMerged_default","__toCommonJS","import_react","import_react","import_react_native_svg","CentralIconBase","children","size","props","React","import_react_native_svg","IconMerged","props","React","CentralIconBase","IconMerged_default"]}

package/IconMerged/index.mjs

@@ -0,0 +1,2 @@
+import t from"react";import C from"react";import{Svg as p}from"react-native-svg";var e=({children:o,size:r=24,...n})=>C.createElement(p,{...n,width:typeof r=="number"?`${r}px`:r,height:typeof r=="number"?`${r}px`:r,viewBox:"0 0 24 24",fill:"none"},o);import{Path as a}from"react-native-svg";var l=o=>t.createElement(e,{...o},t.createElement(a,{d:"M6 3C7.39761 3 8.56905 3.95647 8.90234 5.25H18.75V15.0977C20.0435 15.431 21 16.6024 21 18C21 19.6569 19.6569 21 18 21C16.3431 21 15 19.6569 15 18C15 16.6024 15.9565 15.431 17.25 15.0977V6.75H8.90234C8.63089 7.80351 7.80348 8.62983 6.75 8.90137V15.0977C8.04354 15.431 9 16.6024 9 18C9 19.6569 7.65685 21 6 21C4.34315 21 3 19.6569 3 18C3 16.6024 3.95647 15.431 5.25 15.0977V8.90137C3.95658 8.56799 3 7.39752 3 6C3 4.34315 4.34315 3 6 3Z",fill:"currentColor"})),x=l;export{l as IconMerged,x as default};
+//# sourceMappingURL=index.mjs.map

package/IconMerged/index.mjs.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/IconMerged/index.tsx","../src/CentralIconBase/index.tsx"],"sourcesContent":["import React, { FC } from \"react\";\nimport { CentralIconBase, type CentralIconBaseProps } from \"../CentralIconBase\";\nimport { Path } from \"react-native-svg\";\n\nexport const IconMerged: FC<CentralIconBaseProps> = (props) => {\n  return (\n    <CentralIconBase {...props}>\n      <Path\n        d=\"M6 3C7.39761 3 8.56905 3.95647 8.90234 5.25H18.75V15.0977C20.0435 15.431 21 16.6024 21 18C21 19.6569 19.6569 21 18 21C16.3431 21 15 19.6569 15 18C15 16.6024 15.9565 15.431 17.25 15.0977V6.75H8.90234C8.63089 7.80351 7.80348 8.62983 6.75 8.90137V15.0977C8.04354 15.431 9 16.6024 9 18C9 19.6569 7.65685 21 6 21C4.34315 21 3 19.6569 3 18C3 16.6024 3.95647 15.431 5.25 15.0977V8.90137C3.95658 8.56799 3 7.39752 3 6C3 4.34315 4.34315 3 6 3Z\"\n        fill=\"currentColor\"\n      />\n    </CentralIconBase>\n  );\n};\n\nexport default IconMerged;\n","import React, { FC } from \"react\";\nimport { Svg, SvgProps } from \"react-native-svg\";\n\nexport type CentralIconBaseProps = {\n  size?: string | number;\n} & SvgProps;\n\nexport const CentralIconBase: FC<CentralIconBaseProps> = ({\n  children,\n  size = 24,\n  ...props\n}) => {\n  return (\n    <Svg\n      {...props}\n      width={typeof size === \"number\" ? `${size}px` : size}\n      height={typeof size === \"number\" ? `${size}px` : size}\n      viewBox=\"0 0 24 24\"\n      fill=\"none\"\n    >\n      {children}\n    </Svg>\n  );\n};\n"],"mappings":"AAAA,OAAOA,MAAmB,QCA1B,OAAOC,MAAmB,QAC1B,OAAS,OAAAC,MAAqB,mBAMvB,IAAMC,EAA4C,CAAC,CACxD,SAAAC,EACA,KAAAC,EAAO,GACP,GAAGC,CACL,IAEIL,EAAA,cAACC,EAAA,CACE,GAAGI,EACJ,MAAO,OAAOD,GAAS,SAAW,GAAGA,CAAI,KAAOA,EAChD,OAAQ,OAAOA,GAAS,SAAW,GAAGA,CAAI,KAAOA,EACjD,QAAQ,YACR,KAAK,QAEJD,CACH,EDnBJ,OAAS,QAAAG,MAAY,mBAEd,IAAMC,EAAwCC,GAEjDC,EAAA,cAACC,EAAA,CAAiB,GAAGF,GACnBC,EAAA,cAACH,EAAA,CACC,EAAE,qbACF,KAAK,eACP,CACF,EAIGK,EAAQJ","names":["React","React","Svg","CentralIconBase","children","size","props","Path","IconMerged","props","React","CentralIconBase","IconMerged_default"]}

package/README.md

@@ -462,6 +462,8 @@ Below is a complete list of available icons:
 - IconHammer2
 - IconHook
 - IconLadybug
+- IconMergeConflict
+- IconMerged
 - IconPullRequest
 - IconPush
 - IconRequestClosed

package/filtered-icons.json

@@ -15260,6 +15260,34 @@
       "packageName": "square-filled-radius-0-stroke-1.5",
       "componentName": "IconMegaphone2"
     },
+    {
+      "category": "Code",
+      "svg": "<path d=\"M6.75 15.0977C8.04354 15.431 9 16.6024 9 18C9 19.6569 7.65685 21 6 21C4.34315 21 3 19.6569 3 18C3 16.6024 3.95647 15.431 5.25 15.0977V10H6.75V15.0977Z\" fill=\"currentColor\"/><path d=\"M18.75 15.0977C20.0435 15.431 21 16.6024 21 18C21 19.6569 19.6569 21 18 21C16.3431 21 15 19.6569 15 18C15 16.6024 15.9565 15.431 17.25 15.0977V6.75H10V5.25H18.75V15.0977Z\" fill=\"currentColor\"/><path d=\"M9.06055 4L7.06055 6L9.06055 8L8 9.06055L6 7.06055L4 9.06055L2.93945 8L4.93945 6L2.93945 4L4 2.93945L6 4.93945L8 2.93945L9.06055 4Z\" fill=\"currentColor\"/>",
+      "iconName": "merge-conflict",
+      "variant": {
+        "join": "square",
+        "filled": "on",
+        "radius": "0",
+        "stroke": "1.5"
+      },
+      "createdAt": "2026-03-02T07:00:55.097871+00:00",
+      "packageName": "square-filled-radius-0-stroke-1.5",
+      "componentName": "IconMergeConflict"
+    },
+    {
+      "category": "Code",
+      "svg": "<path d=\"M6 3C7.39761 3 8.56905 3.95647 8.90234 5.25H18.75V15.0977C20.0435 15.431 21 16.6024 21 18C21 19.6569 19.6569 21 18 21C16.3431 21 15 19.6569 15 18C15 16.6024 15.9565 15.431 17.25 15.0977V6.75H8.90234C8.63089 7.80351 7.80348 8.62983 6.75 8.90137V15.0977C8.04354 15.431 9 16.6024 9 18C9 19.6569 7.65685 21 6 21C4.34315 21 3 19.6569 3 18C3 16.6024 3.95647 15.431 5.25 15.0977V8.90137C3.95658 8.56799 3 7.39752 3 6C3 4.34315 4.34315 3 6 3Z\" fill=\"currentColor\"/>",
+      "iconName": "merged",
+      "variant": {
+        "join": "square",
+        "filled": "on",
+        "radius": "0",
+        "stroke": "1.5"
+      },
+      "createdAt": "2026-03-02T07:00:55.097871+00:00",
+      "packageName": "square-filled-radius-0-stroke-1.5",
+      "componentName": "IconMerged"
+    },
     {
       "category": "Sound & Music",
       "svg": "<path d=\"M7.00024 7C7.00024 4.23858 9.23882 2 12.0002 2C14.7617 2 17.0002 4.23858 17.0002 7V11.5C17.0002 14.2614 14.7617 16.5 12.0002 16.5C9.23882 16.5 7.00024 14.2614 7.00024 11.5V7Z\" fill=\"currentColor\"/><path d=\"M19.5634 14.8003L19.8637 14.113L18.4891 13.5125L18.1889 14.1997C17.1466 16.5853 14.767 18.25 12.0002 18.25C9.23343 18.25 6.85381 16.5853 5.81153 14.1997L5.51125 13.5125L4.13672 14.113L4.437 14.8003C5.61432 17.4949 8.19083 19.4407 11.2502 19.7164V22H12.7502V19.7164C15.8096 19.4407 18.3861 17.4949 19.5634 14.8003Z\" fill=\"currentColor\"/>",

package/icons/index.d.ts

@@ -1089,6 +1089,8 @@ export type CentralIconName =
   | "IconMedium"
   | "IconMegaphone"
   | "IconMegaphone2"
+  | "IconMergeConflict"
+  | "IconMerged"
   | "IconMicrophone"
   | "IconMicrophoneOff"
   | "IconMicrophoneSparkle"

package/icons-index.json

@@ -1,6 +1,6 @@
 {
   "package": "@central-icons-react-native/square-filled-radius-0-stroke-1.5",
-  "version": "1.1.148",
+  "version": "1.1.149",
   "style": "square-filled-radius-0-stroke-1.5",
   "importExamples": {
     "individual": "import { IconHome } from '@central-icons-react-native/square-filled-radius-0-stroke-1.5/IconHome';",
@@ -11,7 +11,7 @@
     "withProps": "<IconHome size={32} color=\"#007AFF\" />",
     "central": "<CentralIcon name=\"IconHome\" size={24} color=\"currentColor\" />"
   },
-  "totalIcons": 1831,
+  "totalIcons": 1833,
   "categories": {
     "AI & Magic": {
       "count": 70,
@@ -299,7 +299,7 @@
       ]
     },
     "Code": {
-      "count": 54,
+      "count": 56,
       "icons": [
         "IconAgent",
         "IconAgenticCoding",
@@ -344,6 +344,8 @@
         "IconHammer2",
         "IconHook",
         "IconLadybug",
+        "IconMergeConflict",
+        "IconMerged",
         "IconPullRequest",
         "IconPush",
         "IconRequestClosed",
@@ -3123,6 +3125,8 @@
     "IconMedium": "medium",
     "IconMegaphone": "megaphone, loud, speak, promote, feedback",
     "IconMegaphone2": "megaphone-2, loud, speak, promote, feedback",
+    "IconMergeConflict": "merge-conflict",
+    "IconMerged": "merged",
     "IconMicrophone": "microphone, mic, sound, podcast",
     "IconMicrophoneOff": "microphone-off",
     "IconMicrophoneSparkle": "microphone-sparkle, mic, sound, podcast",

package/index.d.ts

@@ -1088,6 +1088,8 @@ export { IconMedicineTablett, default as IconMedicineTablettDefault, } from "./I
 export { IconMedium, default as IconMediumDefault } from "./IconMedium";
 export { IconMegaphone, default as IconMegaphoneDefault, } from "./IconMegaphone";
 export { IconMegaphone2, default as IconMegaphone2Default, } from "./IconMegaphone2";
+export { IconMergeConflict, default as IconMergeConflictDefault, } from "./IconMergeConflict";
+export { IconMerged, default as IconMergedDefault } from "./IconMerged";
 export { IconMicrophone, default as IconMicrophoneDefault, } from "./IconMicrophone";
 export { IconMicrophoneOff, default as IconMicrophoneOffDefault, } from "./IconMicrophoneOff";
 export { IconMicrophoneSparkle, default as IconMicrophoneSparkleDefault, } from "./IconMicrophoneSparkle";