Remove leftover marker from merge conflict

tulir · tulir · commit 4b7a1aa15cf5 · 2021-05-18T15:55:03.000+03:00
diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -55,7 +55,6 @@ COPY synapse /synapse/synapse/
 #
 # This is aiming at installing only the `packages=find_packages(...)` from `setup.py
 RUN pip install --prefix="/install" --no-deps --no-warn-script-location /synapse
->>>>>>> upstream/release-v1.34.0
 
 ###
 ### Stage 1: runtime

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,6 @@ COPY synapse /synapse/synapse/`
`55`	`55`	`#`
`56`	`56`	# This is aiming at installing only the `packages=find_packages(...)` from `setup.py
`57`	`57`	`RUN pip install --prefix="/install" --no-deps --no-warn-script-location /synapse`
`58`		`->>>>>>> upstream/release-v1.34.0`
`59`	`58`
`60`	`59`	`###`
`61`	`60`	`### Stage 1: runtime`