@central-icons-react-native/round-filled-radius-2-stroke-1 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.5 9.99996C6.77614 9.99996 7 10.2238 7 10.5V15.0498C8.14114 15.2814 9 16.2905 9 17.5C8.99998 18.8807 7.8807 20 6.5 20C5.1193 20 4.00002 18.8807 4 17.5C4 16.2905 4.85886 15.2814 6 15.0498V10.5C6 10.2238 6.22386 9.99996 6.5 9.99996Z",fill:"currentColor"}),e.default.createElement(p.Path,{d:"M15.5 5.99996C16.8807 5.99996 18 7.11925 18 8.49996V15.0498C19.1411 15.2814 20 16.2905 20 17.5C20 18.8807 18.8807 20 17.5 20C16.1193 20 15 18.8807 15 17.5C15 16.2905 15.8589 15.2814 17 15.0498V8.49996C17 7.67154 16.3284 6.99996 15.5 6.99996H10.5C10.2239 6.99996 10 6.77609 10 6.49996C10 6.22382 10.2239 5.99996 10.5 5.99996H15.5Z",fill:"currentColor"}),e.default.createElement(p.Path,{d:"M8.14648 4.14645C8.34175 3.95118 8.65825 3.95118 8.85352 4.14645C9.04876 4.34171 9.04877 4.65822 8.85352 4.85348L7.20703 6.49996L8.85352 8.14645C9.04876 8.34171 9.04877 8.65822 8.85352 8.85348C8.65826 9.04872 8.34174 9.04872 8.14648 8.85348L6.5 7.20699L4.85352 8.85348C4.65826 9.04872 4.34174 9.04872 4.14648 8.85348C3.95123 8.65822 3.95124 8.34171 4.14648 8.14645L5.79297 6.49996L4.14648 4.85348C3.95123 4.65822 3.95124 4.34171 4.14648 4.14645C4.34175 3.95118 4.65825 3.95118 4.85352 4.14645L6.5 5.79293L8.14648 4.14645Z",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.5 9.99996C6.77614 9.99996 7 10.2238 7 10.5V15.0498C8.14114 15.2814 9 16.2905 9 17.5C8.99998 18.8807 7.8807 20 6.5 20C5.1193 20 4.00002 18.8807 4 17.5C4 16.2905 4.85886 15.2814 6 15.0498V10.5C6 10.2238 6.22386 9.99996 6.5 9.99996Z\"\n        fill=\"currentColor\"\n      />\n      <Path\n        d=\"M15.5 5.99996C16.8807 5.99996 18 7.11925 18 8.49996V15.0498C19.1411 15.2814 20 16.2905 20 17.5C20 18.8807 18.8807 20 17.5 20C16.1193 20 15 18.8807 15 17.5C15 16.2905 15.8589 15.2814 17 15.0498V8.49996C17 7.67154 16.3284 6.99996 15.5 6.99996H10.5C10.2239 6.99996 10 6.77609 10 6.49996C10 6.22382 10.2239 5.99996 10.5 5.99996H15.5Z\"\n        fill=\"currentColor\"\n      />\n      <Path\n        d=\"M8.14648 4.14645C8.34175 3.95118 8.65825 3.95118 8.85352 4.14645C9.04876 4.34171 9.04877 4.65822 8.85352 4.85348L7.20703 6.49996L8.85352 8.14645C9.04876 8.34171 9.04877 8.65822 8.85352 8.85348C8.65826 9.04872 8.34174 9.04872 8.14648 8.85348L6.5 7.20699L4.85352 8.85348C4.65826 9.04872 4.34174 9.04872 4.14648 8.85348C3.95123 8.65822 3.95124 8.34171 4.14648 8.14645L5.79297 6.49996L4.14648 4.85348C3.95123 4.65822 3.95124 4.34171 4.14648 4.14645C4.34175 3.95118 4.65825 3.95118 4.85352 4.14645L6.5 5.79293L8.14648 4.14645Z\"\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,2OACF,KAAK,eACP,EACA,EAAAA,QAAA,cAAC,QACC,EAAE,4UACF,KAAK,eACP,EACA,EAAAA,QAAA,cAAC,QACC,EAAE,4gBACF,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.5 9.99996C6.77614 9.99996 7 10.2238 7 10.5V15.0498C8.14114 15.2814 9 16.2905 9 17.5C8.99998 18.8807 7.8807 20 6.5 20C5.1193 20 4.00002 18.8807 4 17.5C4 16.2905 4.85886 15.2814 6 15.0498V10.5C6 10.2238 6.22386 9.99996 6.5 9.99996Z",fill:"currentColor"}),o.createElement(t,{d:"M15.5 5.99996C16.8807 5.99996 18 7.11925 18 8.49996V15.0498C19.1411 15.2814 20 16.2905 20 17.5C20 18.8807 18.8807 20 17.5 20C16.1193 20 15 18.8807 15 17.5C15 16.2905 15.8589 15.2814 17 15.0498V8.49996C17 7.67154 16.3284 6.99996 15.5 6.99996H10.5C10.2239 6.99996 10 6.77609 10 6.49996C10 6.22382 10.2239 5.99996 10.5 5.99996H15.5Z",fill:"currentColor"}),o.createElement(t,{d:"M8.14648 4.14645C8.34175 3.95118 8.65825 3.95118 8.85352 4.14645C9.04876 4.34171 9.04877 4.65822 8.85352 4.85348L7.20703 6.49996L8.85352 8.14645C9.04876 8.34171 9.04877 8.65822 8.85352 8.85348C8.65826 9.04872 8.34174 9.04872 8.14648 8.85348L6.5 7.20699L4.85352 8.85348C4.65826 9.04872 4.34174 9.04872 4.14648 8.85348C3.95123 8.65822 3.95124 8.34171 4.14648 8.14645L5.79297 6.49996L4.14648 4.85348C3.95123 4.65822 3.95124 4.34171 4.14648 4.14645C4.34175 3.95118 4.65825 3.95118 4.85352 4.14645L6.5 5.79293L8.14648 4.14645Z",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.5 9.99996C6.77614 9.99996 7 10.2238 7 10.5V15.0498C8.14114 15.2814 9 16.2905 9 17.5C8.99998 18.8807 7.8807 20 6.5 20C5.1193 20 4.00002 18.8807 4 17.5C4 16.2905 4.85886 15.2814 6 15.0498V10.5C6 10.2238 6.22386 9.99996 6.5 9.99996Z\"\n        fill=\"currentColor\"\n      />\n      <Path\n        d=\"M15.5 5.99996C16.8807 5.99996 18 7.11925 18 8.49996V15.0498C19.1411 15.2814 20 16.2905 20 17.5C20 18.8807 18.8807 20 17.5 20C16.1193 20 15 18.8807 15 17.5C15 16.2905 15.8589 15.2814 17 15.0498V8.49996C17 7.67154 16.3284 6.99996 15.5 6.99996H10.5C10.2239 6.99996 10 6.77609 10 6.49996C10 6.22382 10.2239 5.99996 10.5 5.99996H15.5Z\"\n        fill=\"currentColor\"\n      />\n      <Path\n        d=\"M8.14648 4.14645C8.34175 3.95118 8.65825 3.95118 8.85352 4.14645C9.04876 4.34171 9.04877 4.65822 8.85352 4.85348L7.20703 6.49996L8.85352 8.14645C9.04876 8.34171 9.04877 8.65822 8.85352 8.85348C8.65826 9.04872 8.34174 9.04872 8.14648 8.85348L6.5 7.20699L4.85352 8.85348C4.65826 9.04872 4.34174 9.04872 4.14648 8.85348C3.95123 8.65822 3.95124 8.34171 4.14648 8.14645L5.79297 6.49996L4.14648 4.85348C3.95123 4.65822 3.95124 4.34171 4.14648 4.14645C4.34175 3.95118 4.65825 3.95118 4.85352 4.14645L6.5 5.79293L8.14648 4.14645Z\"\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,2OACF,KAAK,eACP,EACAG,EAAA,cAACH,EAAA,CACC,EAAE,4UACF,KAAK,eACP,EACAG,EAAA,cAACH,EAAA,CACC,EAAE,4gBACF,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.5 4C7.70949 4 8.71858 4.85886 8.9502 6H15.5C16.8807 6 18 7.11929 18 8.5V15.0498C19.1411 15.2814 20 16.2905 20 17.5C20 18.8807 18.8807 20 17.5 20C16.1193 20 15 18.8807 15 17.5C15 16.2905 15.8589 15.2814 17 15.0498V8.5C17 7.67157 16.3284 7 15.5 7H8.9502C8.75138 7.97953 7.97951 8.75033 7 8.94922V15.0498C8.14114 15.2814 9 16.2905 9 17.5C9 18.8807 7.88071 20 6.5 20C5.11929 20 4 18.8807 4 17.5C4 16.2905 4.85886 15.2814 6 15.0498V8.94922C4.85895 8.71753 4 7.70943 4 6.5C4 5.11929 5.11929 4 6.5 4Z",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.5 4C7.70949 4 8.71858 4.85886 8.9502 6H15.5C16.8807 6 18 7.11929 18 8.5V15.0498C19.1411 15.2814 20 16.2905 20 17.5C20 18.8807 18.8807 20 17.5 20C16.1193 20 15 18.8807 15 17.5C15 16.2905 15.8589 15.2814 17 15.0498V8.5C17 7.67157 16.3284 7 15.5 7H8.9502C8.75138 7.97953 7.97951 8.75033 7 8.94922V15.0498C8.14114 15.2814 9 16.2905 9 17.5C9 18.8807 7.88071 20 6.5 20C5.11929 20 4 18.8807 4 17.5C4 16.2905 4.85886 15.2814 6 15.0498V8.94922C4.85895 8.71753 4 7.70943 4 6.5C4 5.11929 5.11929 4 6.5 4Z\"\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,mfACF,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.5 4C7.70949 4 8.71858 4.85886 8.9502 6H15.5C16.8807 6 18 7.11929 18 8.5V15.0498C19.1411 15.2814 20 16.2905 20 17.5C20 18.8807 18.8807 20 17.5 20C16.1193 20 15 18.8807 15 17.5C15 16.2905 15.8589 15.2814 17 15.0498V8.5C17 7.67157 16.3284 7 15.5 7H8.9502C8.75138 7.97953 7.97951 8.75033 7 8.94922V15.0498C8.14114 15.2814 9 16.2905 9 17.5C9 18.8807 7.88071 20 6.5 20C5.11929 20 4 18.8807 4 17.5C4 16.2905 4.85886 15.2814 6 15.0498V8.94922C4.85895 8.71753 4 7.70943 4 6.5C4 5.11929 5.11929 4 6.5 4Z",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.5 4C7.70949 4 8.71858 4.85886 8.9502 6H15.5C16.8807 6 18 7.11929 18 8.5V15.0498C19.1411 15.2814 20 16.2905 20 17.5C20 18.8807 18.8807 20 17.5 20C16.1193 20 15 18.8807 15 17.5C15 16.2905 15.8589 15.2814 17 15.0498V8.5C17 7.67157 16.3284 7 15.5 7H8.9502C8.75138 7.97953 7.97951 8.75033 7 8.94922V15.0498C8.14114 15.2814 9 16.2905 9 17.5C9 18.8807 7.88071 20 6.5 20C5.11929 20 4 18.8807 4 17.5C4 16.2905 4.85886 15.2814 6 15.0498V8.94922C4.85895 8.71753 4 7.70943 4 6.5C4 5.11929 5.11929 4 6.5 4Z\"\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,mfACF,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-2-stroke-1",
       "componentName": "IconMegaphone2"
     },
+    {
+      "category": "Code",
+      "svg": "<path d=\"M6.5 9.99996C6.77614 9.99996 7 10.2238 7 10.5V15.0498C8.14114 15.2814 9 16.2905 9 17.5C8.99998 18.8807 7.8807 20 6.5 20C5.1193 20 4.00002 18.8807 4 17.5C4 16.2905 4.85886 15.2814 6 15.0498V10.5C6 10.2238 6.22386 9.99996 6.5 9.99996Z\" fill=\"currentColor\"/><path d=\"M15.5 5.99996C16.8807 5.99996 18 7.11925 18 8.49996V15.0498C19.1411 15.2814 20 16.2905 20 17.5C20 18.8807 18.8807 20 17.5 20C16.1193 20 15 18.8807 15 17.5C15 16.2905 15.8589 15.2814 17 15.0498V8.49996C17 7.67154 16.3284 6.99996 15.5 6.99996H10.5C10.2239 6.99996 10 6.77609 10 6.49996C10 6.22382 10.2239 5.99996 10.5 5.99996H15.5Z\" fill=\"currentColor\"/><path d=\"M8.14648 4.14645C8.34175 3.95118 8.65825 3.95118 8.85352 4.14645C9.04876 4.34171 9.04877 4.65822 8.85352 4.85348L7.20703 6.49996L8.85352 8.14645C9.04876 8.34171 9.04877 8.65822 8.85352 8.85348C8.65826 9.04872 8.34174 9.04872 8.14648 8.85348L6.5 7.20699L4.85352 8.85348C4.65826 9.04872 4.34174 9.04872 4.14648 8.85348C3.95123 8.65822 3.95124 8.34171 4.14648 8.14645L5.79297 6.49996L4.14648 4.85348C3.95123 4.65822 3.95124 4.34171 4.14648 4.14645C4.34175 3.95118 4.65825 3.95118 4.85352 4.14645L6.5 5.79293L8.14648 4.14645Z\" fill=\"currentColor\"/>",
+      "iconName": "merge-conflict",
+      "variant": {
+        "join": "round",
+        "filled": "on",
+        "radius": "2",
+        "stroke": "1"
+      },
+      "createdAt": "2026-03-02T07:00:55.097871+00:00",
+      "packageName": "round-filled-radius-2-stroke-1",
+      "componentName": "IconMergeConflict"
+    },
+    {
+      "category": "Code",
+      "svg": "<path d=\"M6.5 4C7.70949 4 8.71858 4.85886 8.9502 6H15.5C16.8807 6 18 7.11929 18 8.5V15.0498C19.1411 15.2814 20 16.2905 20 17.5C20 18.8807 18.8807 20 17.5 20C16.1193 20 15 18.8807 15 17.5C15 16.2905 15.8589 15.2814 17 15.0498V8.5C17 7.67157 16.3284 7 15.5 7H8.9502C8.75138 7.97953 7.97951 8.75033 7 8.94922V15.0498C8.14114 15.2814 9 16.2905 9 17.5C9 18.8807 7.88071 20 6.5 20C5.11929 20 4 18.8807 4 17.5C4 16.2905 4.85886 15.2814 6 15.0498V8.94922C4.85895 8.71753 4 7.70943 4 6.5C4 5.11929 5.11929 4 6.5 4Z\" fill=\"currentColor\"/>",
+      "iconName": "merged",
+      "variant": {
+        "join": "round",
+        "filled": "on",
+        "radius": "2",
+        "stroke": "1"
+      },
+      "createdAt": "2026-03-02T07:00:55.097871+00:00",
+      "packageName": "round-filled-radius-2-stroke-1",
+      "componentName": "IconMerged"
+    },
     {
       "category": "Sound & Music",
       "svg": "<path d=\"M7 7C7 4.23858 9.23858 2 12 2C14.7614 2 17 4.23858 17 7V12C17 14.7614 14.7614 17 12 17C9.23858 17 7 14.7614 7 12V7Z\" fill=\"currentColor\"/><path d=\"M5.25164 13.8669C5.17817 13.6007 4.90282 13.4444 4.63663 13.5179C4.37044 13.5914 4.21421 13.8667 4.28768 14.1329C5.17861 17.3609 8.04156 19.7713 11.5 19.9845V21.4999C11.5 21.776 11.7239 21.9999 12 21.9999C12.2762 21.9999 12.5 21.776 12.5 21.4999V19.9845C15.9585 19.7713 18.8215 17.3609 19.7124 14.1329C19.7859 13.8667 19.6296 13.5914 19.3635 13.5179C19.0973 13.4444 18.8219 13.6007 18.7484 13.8669C17.9315 16.8269 15.2189 18.9999 12 18.9999C8.78119 18.9999 6.06859 16.8269 5.25164 13.8669Z\" 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-2-stroke-1",
-  "version": "1.1.148",
+  "version": "1.1.149",
   "style": "round-filled-radius-2-stroke-1",
   "importExamples": {
     "individual": "import { IconHome } from '@central-icons-react-native/round-filled-radius-2-stroke-1/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";