@central-icons-react-native/round-filled-radius-3-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 u=Object.create;var n=Object.defineProperty;var B=Object.getOwnPropertyDescriptor;var I=Object.getOwnPropertyNames;var L=Object.getPrototypeOf,g=Object.prototype.hasOwnProperty;var x=(r,o)=>{for(var C in o)n(r,C,{get:o[C],enumerable:!0})},a=(r,o,C,l)=>{if(o&&typeof o=="object"||typeof o=="function")for(let t of I(o))!g.call(r,t)&&t!==C&&n(r,t,{get:()=>o[t],enumerable:!(l=B(o,t))||l.enumerable});return r};var f=(r,o,C)=>(C=r!=null?u(L(r)):{},a(o||!r||!r.__esModule?n(C,"default",{value:r,enumerable:!0}):C,r)),P=r=>a(n({},"__esModule",{value:!0}),r);var v={};x(v,{IconMergeConflict:()=>i,default:()=>d});module.exports=P(v);var e=f(require("react"));var m=f(require("react")),s=require("react-native-svg"),c=({children:r,size:o=24,...C})=>m.default.createElement(s.Svg,{...C,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"),i=r=>e.default.createElement(c,{...r},e.default.createElement(p.Path,{d:"M6 9.99994C6.41421 9.99994 6.75 10.3357 6.75 10.7499V15.0976C8.04354 15.4309 9 16.6023 9 17.9999C8.99997 19.6568 7.65684 20.9999 6 20.9999C4.34316 20.9999 3.00003 19.6568 3 17.9999C3 16.6023 3.95647 15.4309 5.25 15.0976V10.7499C5.25 10.3357 5.58579 9.99994 6 9.99994Z",fill:"currentColor"}),e.default.createElement(p.Path,{d:"M15 5.24994C17.0711 5.24994 18.75 6.92888 18.75 8.99994V15.0976C20.0435 15.4309 21 16.6023 21 17.9999C21 19.6568 19.6568 20.9999 18 20.9999C16.3432 20.9999 15 19.6568 15 17.9999C15 16.6023 15.9565 15.4309 17.25 15.0976V8.99994C17.25 7.7573 16.2426 6.74994 15 6.74994H10.75C10.3358 6.74994 10 6.41413 10 5.99994C10 5.58573 10.3358 5.24994 10.75 5.24994H15Z",fill:"currentColor"}),e.default.createElement(p.Path,{d:"M7.46973 3.46967C7.76262 3.17678 8.23738 3.17678 8.53027 3.46967C8.82314 3.76257 8.82316 4.23733 8.53027 4.53022L7.06055 5.99994L8.53027 7.46967C8.82314 7.76257 8.82316 8.23733 8.53027 8.53022C8.23739 8.82307 7.76261 8.82307 7.46973 8.53022L6 7.06049L4.53027 8.53022C4.23739 8.82307 3.76261 8.82307 3.46973 8.53022C3.17684 8.23733 3.17686 7.76257 3.46973 7.46967L4.93945 5.99994L3.46973 4.53022C3.17684 4.23733 3.17686 3.76257 3.46973 3.46967C3.76262 3.17678 4.23738 3.17678 4.53027 3.46967L6 4.9394L7.46973 3.46967Z",fill:"currentColor"})),d=i;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 9.99994C6.41421 9.99994 6.75 10.3357 6.75 10.7499V15.0976C8.04354 15.4309 9 16.6023 9 17.9999C8.99997 19.6568 7.65684 20.9999 6 20.9999C4.34316 20.9999 3.00003 19.6568 3 17.9999C3 16.6023 3.95647 15.4309 5.25 15.0976V10.7499C5.25 10.3357 5.58579 9.99994 6 9.99994Z\"\n        fill=\"currentColor\"\n      />\n      <Path\n        d=\"M15 5.24994C17.0711 5.24994 18.75 6.92888 18.75 8.99994V15.0976C20.0435 15.4309 21 16.6023 21 17.9999C21 19.6568 19.6568 20.9999 18 20.9999C16.3432 20.9999 15 19.6568 15 17.9999C15 16.6023 15.9565 15.4309 17.25 15.0976V8.99994C17.25 7.7573 16.2426 6.74994 15 6.74994H10.75C10.3358 6.74994 10 6.41413 10 5.99994C10 5.58573 10.3358 5.24994 10.75 5.24994H15Z\"\n        fill=\"currentColor\"\n      />\n      <Path\n        d=\"M7.46973 3.46967C7.76262 3.17678 8.23738 3.17678 8.53027 3.46967C8.82314 3.76257 8.82316 4.23733 8.53027 4.53022L7.06055 5.99994L8.53027 7.46967C8.82314 7.76257 8.82316 8.23733 8.53027 8.53022C8.23739 8.82307 7.76261 8.82307 7.46973 8.53022L6 7.06049L4.53027 8.53022C4.23739 8.82307 3.76261 8.82307 3.46973 8.53022C3.17684 8.23733 3.17686 7.76257 3.46973 7.46967L4.93945 5.99994L3.46973 4.53022C3.17684 4.23733 3.17686 3.76257 3.46973 3.46967C3.76262 3.17678 4.23738 3.17678 4.53027 3.46967L6 4.9394L7.46973 3.46967Z\"\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,8QACF,KAAK,eACP,EACA,EAAAA,QAAA,cAAC,QACC,EAAE,sWACF,KAAK,eACP,EACA,EAAAA,QAAA,cAAC,QACC,EAAE,ugBACF,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 e=({children:C,size:r=24,...n})=>p.createElement(l,{...n,width:typeof r=="number"?`${r}px`:r,height:typeof r=="number"?`${r}px`:r,viewBox:"0 0 24 24",fill:"none"},C);import{Path as t}from"react-native-svg";var a=C=>o.createElement(e,{...C},o.createElement(t,{d:"M6 9.99994C6.41421 9.99994 6.75 10.3357 6.75 10.7499V15.0976C8.04354 15.4309 9 16.6023 9 17.9999C8.99997 19.6568 7.65684 20.9999 6 20.9999C4.34316 20.9999 3.00003 19.6568 3 17.9999C3 16.6023 3.95647 15.4309 5.25 15.0976V10.7499C5.25 10.3357 5.58579 9.99994 6 9.99994Z",fill:"currentColor"}),o.createElement(t,{d:"M15 5.24994C17.0711 5.24994 18.75 6.92888 18.75 8.99994V15.0976C20.0435 15.4309 21 16.6023 21 17.9999C21 19.6568 19.6568 20.9999 18 20.9999C16.3432 20.9999 15 19.6568 15 17.9999C15 16.6023 15.9565 15.4309 17.25 15.0976V8.99994C17.25 7.7573 16.2426 6.74994 15 6.74994H10.75C10.3358 6.74994 10 6.41413 10 5.99994C10 5.58573 10.3358 5.24994 10.75 5.24994H15Z",fill:"currentColor"}),o.createElement(t,{d:"M7.46973 3.46967C7.76262 3.17678 8.23738 3.17678 8.53027 3.46967C8.82314 3.76257 8.82316 4.23733 8.53027 4.53022L7.06055 5.99994L8.53027 7.46967C8.82314 7.76257 8.82316 8.23733 8.53027 8.53022C8.23739 8.82307 7.76261 8.82307 7.46973 8.53022L6 7.06049L4.53027 8.53022C4.23739 8.82307 3.76261 8.82307 3.46973 8.53022C3.17684 8.23733 3.17686 7.76257 3.46973 7.46967L4.93945 5.99994L3.46973 4.53022C3.17684 4.23733 3.17686 3.76257 3.46973 3.46967C3.76262 3.17678 4.23738 3.17678 4.53027 3.46967L6 4.9394L7.46973 3.46967Z",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 9.99994C6.41421 9.99994 6.75 10.3357 6.75 10.7499V15.0976C8.04354 15.4309 9 16.6023 9 17.9999C8.99997 19.6568 7.65684 20.9999 6 20.9999C4.34316 20.9999 3.00003 19.6568 3 17.9999C3 16.6023 3.95647 15.4309 5.25 15.0976V10.7499C5.25 10.3357 5.58579 9.99994 6 9.99994Z\"\n        fill=\"currentColor\"\n      />\n      <Path\n        d=\"M15 5.24994C17.0711 5.24994 18.75 6.92888 18.75 8.99994V15.0976C20.0435 15.4309 21 16.6023 21 17.9999C21 19.6568 19.6568 20.9999 18 20.9999C16.3432 20.9999 15 19.6568 15 17.9999C15 16.6023 15.9565 15.4309 17.25 15.0976V8.99994C17.25 7.7573 16.2426 6.74994 15 6.74994H10.75C10.3358 6.74994 10 6.41413 10 5.99994C10 5.58573 10.3358 5.24994 10.75 5.24994H15Z\"\n        fill=\"currentColor\"\n      />\n      <Path\n        d=\"M7.46973 3.46967C7.76262 3.17678 8.23738 3.17678 8.53027 3.46967C8.82314 3.76257 8.82316 4.23733 8.53027 4.53022L7.06055 5.99994L8.53027 7.46967C8.82314 7.76257 8.82316 8.23733 8.53027 8.53022C8.23739 8.82307 7.76261 8.82307 7.46973 8.53022L6 7.06049L4.53027 8.53022C4.23739 8.82307 3.76261 8.82307 3.46973 8.53022C3.17684 8.23733 3.17686 7.76257 3.46973 7.46967L4.93945 5.99994L3.46973 4.53022C3.17684 4.23733 3.17686 3.76257 3.46973 3.46967C3.76262 3.17678 4.23738 3.17678 4.53027 3.46967L6 4.9394L7.46973 3.46967Z\"\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,8QACF,KAAK,eACP,EACAG,EAAA,cAACH,EAAA,CACC,EAAE,sWACF,KAAK,eACP,EACAG,EAAA,cAACH,EAAA,CACC,EAAE,ugBACF,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.25H15C17.0711 5.25 18.75 6.92893 18.75 9V15.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.0977V9C17.25 7.75736 16.2426 6.75 15 6.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.25H15C17.0711 5.25 18.75 6.92893 18.75 9V15.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.0977V9C17.25 7.75736 16.2426 6.75 15 6.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,qfACF,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.25H15C17.0711 5.25 18.75 6.92893 18.75 9V15.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.0977V9C17.25 7.75736 16.2426 6.75 15 6.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.25H15C17.0711 5.25 18.75 6.92893 18.75 9V15.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.0977V9C17.25 7.75736 16.2426 6.75 15 6.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,qfACF,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": "round-filled-radius-3-stroke-1.5",
       "componentName": "IconMegaphone2"
     },
+    {
+      "category": "Code",
+      "svg": "<path d=\"M6 9.99994C6.41421 9.99994 6.75 10.3357 6.75 10.7499V15.0976C8.04354 15.4309 9 16.6023 9 17.9999C8.99997 19.6568 7.65684 20.9999 6 20.9999C4.34316 20.9999 3.00003 19.6568 3 17.9999C3 16.6023 3.95647 15.4309 5.25 15.0976V10.7499C5.25 10.3357 5.58579 9.99994 6 9.99994Z\" fill=\"currentColor\"/><path d=\"M15 5.24994C17.0711 5.24994 18.75 6.92888 18.75 8.99994V15.0976C20.0435 15.4309 21 16.6023 21 17.9999C21 19.6568 19.6568 20.9999 18 20.9999C16.3432 20.9999 15 19.6568 15 17.9999C15 16.6023 15.9565 15.4309 17.25 15.0976V8.99994C17.25 7.7573 16.2426 6.74994 15 6.74994H10.75C10.3358 6.74994 10 6.41413 10 5.99994C10 5.58573 10.3358 5.24994 10.75 5.24994H15Z\" fill=\"currentColor\"/><path d=\"M7.46973 3.46967C7.76262 3.17678 8.23738 3.17678 8.53027 3.46967C8.82314 3.76257 8.82316 4.23733 8.53027 4.53022L7.06055 5.99994L8.53027 7.46967C8.82314 7.76257 8.82316 8.23733 8.53027 8.53022C8.23739 8.82307 7.76261 8.82307 7.46973 8.53022L6 7.06049L4.53027 8.53022C4.23739 8.82307 3.76261 8.82307 3.46973 8.53022C3.17684 8.23733 3.17686 7.76257 3.46973 7.46967L4.93945 5.99994L3.46973 4.53022C3.17684 4.23733 3.17686 3.76257 3.46973 3.46967C3.76262 3.17678 4.23738 3.17678 4.53027 3.46967L6 4.9394L7.46973 3.46967Z\" fill=\"currentColor\"/>",
+      "iconName": "merge-conflict",
+      "variant": {
+        "join": "round",
+        "filled": "on",
+        "radius": "3",
+        "stroke": "1.5"
+      },
+      "createdAt": "2026-03-02T07:00:55.097871+00:00",
+      "packageName": "round-filled-radius-3-stroke-1.5",
+      "componentName": "IconMergeConflict"
+    },
+    {
+      "category": "Code",
+      "svg": "<path d=\"M6 3C7.39761 3 8.56905 3.95647 8.90234 5.25H15C17.0711 5.25 18.75 6.92893 18.75 9V15.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.0977V9C17.25 7.75736 16.2426 6.75 15 6.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": "round",
+        "filled": "on",
+        "radius": "3",
+        "stroke": "1.5"
+      },
+      "createdAt": "2026-03-02T07:00:55.097871+00:00",
+      "packageName": "round-filled-radius-3-stroke-1.5",
+      "componentName": "IconMerged"
+    },
     {
       "category": "Sound & Music",
       "svg": "<path d=\"M7.00122 7C7.00122 4.23858 9.2398 2 12.0012 2C14.7626 2 17.0012 4.23858 17.0012 7V11.5C17.0012 14.2614 14.7626 16.5 12.0012 16.5C9.2398 16.5 7.00122 14.2614 7.00122 11.5V7Z\" fill=\"currentColor\"/><path d=\"M5.81245 14.1997C5.64662 13.8201 5.20448 13.6468 4.82491 13.8127C4.44535 13.9785 4.27209 14.4207 4.43793 14.8002C5.61525 17.4948 8.19176 19.4406 11.2511 19.7163V21.2499C11.2511 21.6642 11.5869 21.9999 12.0011 21.9999C12.4153 21.9999 12.7511 21.6642 12.7511 21.2499V19.7163C15.8105 19.4406 18.387 17.4948 19.5643 14.8002C19.7302 14.4207 19.5569 13.9785 19.1773 13.8127C18.7978 13.6468 18.3556 13.8201 18.1898 14.1997C17.1475 16.5852 14.7679 18.2499 12.0011 18.2499C9.23436 18.2499 6.85474 16.5852 5.81245 14.1997Z\" 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/round-filled-radius-3-stroke-1.5",
-  "version": "1.1.148",
+  "version": "1.1.149",
   "style": "round-filled-radius-3-stroke-1.5",
   "importExamples": {
     "individual": "import { IconHome } from '@central-icons-react-native/round-filled-radius-3-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";