From 026311a4152f31e2b5c3897c4430f466ed14b1da Mon Sep 17 00:00:00 2001 From: Matthias Schoettle Date: Mon, 5 Oct 2026 11:41:03 -0400 Subject: [PATCH] docs: remove leftover merge conflict markers from codespace document --- codespaces.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/codespaces.md b/codespaces.md index ccc9942..3186afc 100644 --- a/codespaces.md +++ b/codespaces.md @@ -12,11 +12,7 @@ This will open a new tab containing a familiar VSCode-style interface. It may ta Eventually, the Codespace will display the readme for the repo in the top two-thirds of the screen, and a Temporal Service running on the command line in the bottom third of the screen: -<<<<<<< HEAD ![3 — Loaded Codespace](https://raw.githubusercontent.com/temporalio/temporal-learning/refs/heads/main/static/courses/common/codespaces/3-loaded-codespace.png) -======= -![3 — Loaded Codespace](https://raw.githubusercontent.com/temporalio/temporal-learning/refs/heads/main/static/courses/common/codespaces/3-loaded-codespace.png) ->>>>>>> 0efc306 (adds codespaces) There are two things you’ll want to do before getting started: open the Web UI, and open some terminal windows to work in.