{
  "$schema": "https://ui.shadcn.com/schema/registry-item.json",
  "name": "git-merge-conflict",
  "type": "registry:component",
  "title": "GitMergeConflict",
  "description": "GitMergeConflict icon from Vadivam, a 24px outline icon set. Tags: code, version control, commits, diff, error, conflict.",
  "author": "Praveen Juge <https://vadivam.praveenjuge.com>",
  "registryDependencies": [
    "https://vadivam.praveenjuge.com/r/vadivam-icon.json"
  ],
  "files": [
    {
      "path": "registry/icons/git-merge-conflict.tsx",
      "content": "import { VadivamIcon, type VadivamIconProps } from \"./vadivam-icon\";\n\nexport function GitMergeConflict(props: VadivamIconProps) {\n  return (\n    <VadivamIcon name=\"git-merge-conflict\" {...props}>\n      <path d=\"M5 22V11.5C5 15.642 9.925 19 16 19a3 3 0 1 0 6 0 3 3 0 0 0-6 0M2 2l6 6M2 8l6-6\" />\n    </VadivamIcon>\n  );\n}\n\nexport { GitMergeConflict as GitMergeConflictIcon };\nexport default GitMergeConflict;\n",
      "type": "registry:component",
      "target": "@components/icons/git-merge-conflict.tsx"
    }
  ],
  "categories": [
    "development"
  ],
  "meta": {
    "tags": [
      "code",
      "version control",
      "commits",
      "diff",
      "error",
      "conflict"
    ],
    "lucide": "git-merge-conflict"
  },
  "docs": "Preview and other formats: https://vadivam.praveenjuge.com/icons/git-merge-conflict"
}
