From 4ffb12e489f4cd5c764d3fb2c7ec669364a73938 Mon Sep 17 00:00:00 2001 From: Tara X V01D <1711810+taraxvoid@users.noreply.github.com> Date: Fri, 2 Oct 2026 14:16:55 -0500 Subject: [PATCH] docs: drop stray conflict marker, fix lefthook remote ref comment Co-Authored-By: Claude Sonnet 5.5 --- README.md | 1 - lefthook/site.yml | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 9f63a60..3d9226e 100644 --- a/README.md +++ b/README.md @@ -182,7 +182,6 @@ remote's `ref` tag, and tool versions in a `justfile` (annotate the line above with `# renovate: datasource=... depName=...`). Requires the Renovate GitHub App on the repo. -||||||| 4041a59 ## Git hooks (lefthook) [`lefthook/site.yml`](lefthook/site.yml) is the shared hook set for the site diff --git a/lefthook/site.yml b/lefthook/site.yml index b1a9c94..728ed62 100644 --- a/lefthook/site.yml +++ b/lefthook/site.yml @@ -5,7 +5,7 @@ # # lefthook.yml in the site # remotes: # - git_url: https://github.com/taraxvoid/voidflow -# ref: # pin; bump deliberately +# ref: # a tag or branch (not a SHA); bump deliberately # configs: # - lefthook/site.yml #