fixup to 70b517c: remove errant conflict marker #839

	name: website

	on:
	push:
	branches:
	- main

	permissions:
	contents: write

	jobs:
	prerelease-docs-build-deploy:
	strategy:
	matrix:
	os: [ubuntu-latest]
	runs-on: ${{ matrix.os }}

	steps:
	- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b
	- run: "git fetch origin gh-pages --depth=1"
	- uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d
	with:
	python-version: 3.11
	- name: Install poetry
	uses: abatilo/actions-poetry@7b6d33e44b4f08d7021a1dee3c044e9c253d6439
	with:
	poetry-version: latest
	- name: Install dependencies, compile and deploy docs
	run: \|
	git config user.name 'jj-docs[bot]'
	git config user.email 'jj-docs[bot]@users.noreply.github.io'
	.github/scripts/docs-build-deploy 'https://martinvonz.github.io/jj' prerelease main --push
	- name: "Show `git diff --stat`"
	run: git diff --stat gh-pages^ gh-pages \|\| echo "(No diffs)"

Provide feedback