[PR #5] [MERGED] Fixed merge conflicts #4406

New Issue

GiteaMirror · 2026-04-19T12:25:41-05:00

GiteaMirror commented

2026-04-19 12:25:41 -05:00

📋 Pull Request Information

Original PR: https://github.com/harvard-edge/cs249r_book/pull/5
Author: @profvjreddi
Created: 9/17/2023
Status: ✅ Merged
Merged: 9/17/2023
Merged by: @profvjreddi

Base: main ← Head: lunchbox

📝 Commits (4)

81a81cb Fixed merge conflicts in main branch
269e548 Added dedication to nav
9cc1029 Connecting with the audience
4ee4182 Merge branch 'main' into lunchbox

📊 Changes

4 files changed (+24 additions, -4 deletions)

View changed files

📝 _quarto.yml (+1 -0)
📝 about.qmd (+16 -4)
📝 dedication.qmd (+4 -0)
📝 index.qmd (+3 -0)

📄 Description

No description provided

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/harvard-edge/cs249r_book/pull/5 **Author:** [@profvjreddi](https://github.com/profvjreddi) **Created:** 9/17/2023 **Status:** ✅ Merged **Merged:** 9/17/2023 **Merged by:** [@profvjreddi](https://github.com/profvjreddi) **Base:** `main` ← **Head:** `lunchbox` --- ### 📝 Commits (4) - [`81a81cb`](https://github.com/harvard-edge/cs249r_book/commit/81a81cb8f2e5c7c5a016dd781bf22ce9dead028d) Fixed merge conflicts in main branch - [`269e548`](https://github.com/harvard-edge/cs249r_book/commit/269e548efcca3493d08bcc6d74507584757cc1cf) Added dedication to nav - [`9cc1029`](https://github.com/harvard-edge/cs249r_book/commit/9cc1029c87ca08b4de28e5bc20d9f4ca28353444) Connecting with the audience - [`4ee4182`](https://github.com/harvard-edge/cs249r_book/commit/4ee418277491502e5ad0c3e0f86185bc9ee7c8d4) Merge branch 'main' into lunchbox ### 📊 Changes **4 files changed** (+24 additions, -4 deletions) <details> <summary>View changed files</summary> 📝 `_quarto.yml` (+1 -0) 📝 `about.qmd` (+16 -4) 📝 `dedication.qmd` (+4 -0) 📝 `index.qmd` (+3 -0) </details> ### 📄 Description _No description provided_ --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>

GiteaMirror added the pull-request label 2026-04-19 12:25:41 -05:00

GiteaMirror closed this issue

2026-04-19 12:25:42 -05:00

Sign in to join this conversation.

1 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: github-starred/cs249r_book#4406