From 8553deab14419a2ea45882bf9f01c0a56460cc54 Mon Sep 17 00:00:00 2001 From: Aaron Powell Date: Wed, 25 Feb 2026 15:12:53 +1100 Subject: [PATCH] Fixing merge issue --- CONTRIBUTING.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 0a007177..0d7a9f81 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -313,12 +313,8 @@ We welcome many kinds of contributions, including the custom categories below: | **Instructions** | Custom instruction sets that guide GitHub Copilot behavior | 🧭 | | **Agents** | Defined GitHub Copilot roles or personalities | 🎭 | | **Skills** | Specialized knowledge of a task for GitHub Copilot | 🧰 | -<<<<<<< HEAD | **Workflows** | Agentic Workflows for AI-powered repository automation | ⚡ | | **Plugins** | Installable packages of related prompts, agents, or skills | 🎁 | -======= -| **Plugins** | Installable packages of related agents, commands, or skills | 🎁 | ->>>>>>> 9e10967 (Update documentation to remove prompts references) In addition, all standard contribution types supported by [All Contributors](https://allcontributors.org/emoji-key/) are recognized.