mirror of
https://github.com/storytold/photocraft.git
synced 2026-11-01 22:07:28 -06:00
Resolve the contributors/people.toml append conflict by keeping both sides: main's three new entries and this branch's entry.
Resolve the contributors/people.toml append conflict by keeping both sides: main's three new entries and this branch's entry.