Merge pull request #420 from ComputerScienceHouse/fix-merge-conflict

goosenotduck · web-flow · commit 66bceec75c57 · 2025-10-21T18:47:42.000Z
Fix merge conflict
diff --git a/Dockerfile b/Dockerfile
@@ -29,4 +29,4 @@ RUN rm -rf node_modules && \
 
 RUN ln -sf /usr/share/zoneinfo/America/New_York /etc/localtime
 
-CMD ["ddtrace-run", "gunicorn", "conditional:app", "--bind=0.0.0.0:8080", "--access-logfile=-", "--timeout=256"]
+CMD ["gunicorn", "conditional:app", "--bind=0.0.0.0:8080", "--access-logfile=-", "--timeout=256"]

Original file line number	Diff line number	Diff line change
`@@ -29,4 +29,4 @@ RUN rm -rf node_modules && \`
`29`	`29`
`30`	`30`	`RUN ln -sf /usr/share/zoneinfo/America/New_York /etc/localtime`
`31`	`31`
`32`		`-CMD ["ddtrace-run", "gunicorn", "conditional:app", "--bind=0.0.0.0:8080", "--access-logfile=-", "--timeout=256"]`
	`32`	`+CMD ["gunicorn", "conditional:app", "--bind=0.0.0.0:8080", "--access-logfile=-", "--timeout=256"]`