commit 1855b798db6a77bf80be95c63e09cc3e9831e2df equwal <13551856+equwal@users.noreply.github.com> 2026-10-05 02:23:28 -0700 cleanup: remove conflict files
rules/license.md.conflict-pc-20261005 | 9 --------- skills/ccai-license/SKILL.md.conflict-pc-20261005 | 15 --------------- 2 files changed, 24 deletions(-)
diff --git a/rules/license.md.conflict-pc-20261005 b/rules/license.md.conflict-pc-20261005 deleted file mode 100644 index fead9dc..0000000 --- a/rules/license.md.conflict-pc-20261005 +++ /dev/null @@ -1,9 +0,0 @@ -## MANDATORY: New projects use the CCAI License v1.0 - -Give each new project the Contextual Copyleft AI (CCAI) License v1.0 as its `LICENSE` file from the first commit. This includes private repos, so they are licensed when they become public. - -- Copy the text byte-for-byte from `CCAI-1.0.txt` in the `ccai-license` skill folder. Never retype it. -- Replace `[year]` with the current year and `[author]` with the repo's `git config user.name`. -- If a manifest has a license field, point it at the file: npm `"SEE LICENSE IN LICENSE"`, Cargo `license-file = "LICENSE"`, pyproject `license = {file = "LICENSE"}`, other formats `LicenseRef-CCAI-1.0`. -- Exception: a fork, a patch for an upstream project, and client or employer work keep the license of their owner. -- Apps published on F-Droid, or any store or distro that requires an OSI/FSF license, keep a plain FLOSS license with no CCAI. diff --git a/skills/ccai-license/SKILL.md.conflict-pc-20261005 b/skills/ccai-license/SKILL.md.conflict-pc-20261005 deleted file mode 100644 index 7137699..0000000 --- a/skills/ccai-license/SKILL.md.conflict-pc-20261005 +++ /dev/null @@ -1,15 +0,0 @@ ---- -name: ccai-license -description: Add jose's default license, the Contextual Copyleft AI (CCAI) License v1.0, to a new project. Use when you create a repo or project, or when asked to license one. ---- - -# ccai-license - -`CCAI-1.0.txt` in this folder is the license text, byte-for-byte as jose gave it. - -1. Copy `CCAI-1.0.txt` to `LICENSE` in the project root. Copy the file; do not retype the text. -2. Replace `[year]` with the current year and `[author]` with `git config user.name`. -3. If a manifest has a license field, set it: npm `"SEE LICENSE IN LICENSE"`, Cargo `license-file = "LICENSE"`, pyproject `license = {file = "LICENSE"}`, other formats `LicenseRef-CCAI-1.0`. -4. Commit `LICENSE` (and the manifest change) in its own commit. - -Do not use it for a fork, a patch for an upstream project, client or employer work, or apps published on F-Droid or any store or distro that requires an OSI/FSF license. Those keep their owner's license or a plain FLOSS license with no CCAI.