[PR #265] [CLOSED] Fix merge error causing build failures #669

Closed
opened 2026-03-22 15:48:08 -05:00 by GiteaMirror · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/harvard-edge/cs249r_book/pull/265
Author: @profvjreddi
Created: 6/11/2024
Status: Closed

Base: mainHead: dev


📝 Commits (10+)

  • e9e21bc Updated the introduction material and removed foreword content
  • 4a486b4 Update readme and contributors.qmd with contributors
  • b91d308 Merge remote-tracking branch 'origin/dev' into kai-widget
  • 2228ecc Merge branch 'kai-widget' into dev
  • 2f40274 Update readme and contributors.qmd with contributors
  • 25567be Restoring the bundle JS files that were deleted
  • a03193e Merge branch 'kai-widget' into dev
  • 97c3b97 Restoring bundle.js
  • 0506c0f Merge branch 'kai-widget' into dev
  • c489b7f Update readme and contributors.qmd with contributors

📊 Changes

13 files changed (+289 additions, -1342 deletions)

View changed files

📝 .all-contributorsrc (+131 -138)
📝 README.md (+28 -31)
📝 _quarto.yml (+3 -3)
contents/acknowledgements/acknowledgements.html (+0 -1055)
📝 contents/contributors.qmd (+28 -31)
📝 contents/foreword.qmd (+0 -83)
📝 contents/introduction/introduction.qmd (+93 -1)
scripts/ai_menu/dist/142.bundle.js (+1 -0)
scripts/ai_menu/dist/2225addae43ee43f8435.js (+1 -0)
scripts/ai_menu/dist/384.bundle.js (+1 -0)
scripts/ai_menu/dist/761.bundle.js (+1 -0)
scripts/ai_menu/dist/bundle.js (+1 -0)
scripts/ai_menu/dist/e6c326dca20dcdeceea6.js (+1 -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/265 **Author:** [@profvjreddi](https://github.com/profvjreddi) **Created:** 6/11/2024 **Status:** ❌ Closed **Base:** `main` ← **Head:** `dev` --- ### 📝 Commits (10+) - [`e9e21bc`](https://github.com/harvard-edge/cs249r_book/commit/e9e21bc9b3fe076e22e5bdc97c858b83a1084265) Updated the introduction material and removed foreword content - [`4a486b4`](https://github.com/harvard-edge/cs249r_book/commit/4a486b40cbe7c0a89280121f882227a74e59ca6d) Update readme and contributors.qmd with contributors - [`b91d308`](https://github.com/harvard-edge/cs249r_book/commit/b91d308fe677822bf26a68b1c61a1d114f487643) Merge remote-tracking branch 'origin/dev' into kai-widget - [`2228ecc`](https://github.com/harvard-edge/cs249r_book/commit/2228ecc9a1ba270c73511b27d79b9bad0000f6a9) Merge branch 'kai-widget' into dev - [`2f40274`](https://github.com/harvard-edge/cs249r_book/commit/2f402743d5fb86138d36f57c41c98cf5ba96e279) Update readme and contributors.qmd with contributors - [`25567be`](https://github.com/harvard-edge/cs249r_book/commit/25567be6231a37fa0ca437b1e365aec599ad4339) Restoring the bundle JS files that were deleted - [`a03193e`](https://github.com/harvard-edge/cs249r_book/commit/a03193e34d730f27835e78d704a9e3c0b180731e) Merge branch 'kai-widget' into dev - [`97c3b97`](https://github.com/harvard-edge/cs249r_book/commit/97c3b97c1a5535a8754865d9b5443fc9525be716) Restoring bundle.js - [`0506c0f`](https://github.com/harvard-edge/cs249r_book/commit/0506c0f609c3141cf1f196d774618088baafacd7) Merge branch 'kai-widget' into dev - [`c489b7f`](https://github.com/harvard-edge/cs249r_book/commit/c489b7fbd87f6a27a5dfb80726f866812346a01a) Update readme and contributors.qmd with contributors ### 📊 Changes **13 files changed** (+289 additions, -1342 deletions) <details> <summary>View changed files</summary> 📝 `.all-contributorsrc` (+131 -138) 📝 `README.md` (+28 -31) 📝 `_quarto.yml` (+3 -3) ➖ `contents/acknowledgements/acknowledgements.html` (+0 -1055) 📝 `contents/contributors.qmd` (+28 -31) 📝 `contents/foreword.qmd` (+0 -83) 📝 `contents/introduction/introduction.qmd` (+93 -1) ➕ `scripts/ai_menu/dist/142.bundle.js` (+1 -0) ➕ `scripts/ai_menu/dist/2225addae43ee43f8435.js` (+1 -0) ➕ `scripts/ai_menu/dist/384.bundle.js` (+1 -0) ➕ `scripts/ai_menu/dist/761.bundle.js` (+1 -0) ➕ `scripts/ai_menu/dist/bundle.js` (+1 -0) ➕ `scripts/ai_menu/dist/e6c326dca20dcdeceea6.js` (+1 -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-03-22 15:48:08 -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#669