🔀 Merge: resolved conflicts with github master

This commit is contained in:
Mark Randall Havens 2025-06-07 00:28:31 -05:00
commit 38bfa138c3
4 changed files with 67 additions and 0 deletions

View file

@ -111,6 +111,7 @@
[2025-06-06 12:25:38] Radicle: RID=rad:z3FEj7rF8gZw9eFksCuiN43qjzrex, Peer ID=z6Mkw5s3ppo26C7y7tGK5MD8n2GqTHS582PPpeX5Xqbu2Mpz
CLI: rad inspect rad:z3FEj7rF8gZw9eFksCuiN43qjzrex # View project details
CLI: git ls-tree -r --name-only HEAD # View file structure
<<<<<<< HEAD
[2025-06-07 00:07:30] Local:
[2025-06-07 00:07:39] Radicle: RID=rad:z3FEj7rF8gZw9eFksCuiN43qjzrex, Peer ID=z6Mkw5s3ppo26C7y7tGK5MD8n2GqTHS582PPpeX5Xqbu2Mpz
CLI: rad inspect rad:z3FEj7rF8gZw9eFksCuiN43qjzrex # View project details
@ -135,3 +136,8 @@
[2025-06-07 00:14:56] GitLab: https://gitlab.com/mrhavens/git-sigil
[2025-06-07 00:15:19] Bitbucket: https://bitbucket.org/thefoldwithin/git-sigil
[2025-06-07 00:15:41] GitHub: https://github.com/mrhavens/git-sigil
=======
[2025-06-06 12:25:42] Forgejo: https://remember.thefoldwithin.earth/mrhavens/git-sigil
[2025-06-06 12:25:55] GitLab: https://gitlab.com/mrhavens/git-sigil
[2025-06-06 12:26:12] Bitbucket: https://bitbucket.org/thefoldwithin/git-sigil
>>>>>>> 4b323cbd7da16625ba04d2a7e8db3532f84bc1e0