[PR #264] [MERGED] Fix merge error causing build failures #668

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

📋 Pull Request Information

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

Base: mainHead: dev


📝 Commits (2)

  • ebee83b Fix merge error causing build failures
  • 01ce951 Update readme and contributors.qmd with contributors

📊 Changes

4 files changed (+196 additions, -186 deletions)

View changed files

📝 .all-contributorsrc (+134 -127)
📝 README.md (+31 -28)
📝 contents/contributors.qmd (+31 -28)
📝 contents/hw_acceleration/hw_acceleration.qmd (+0 -3)

📄 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/264 **Author:** [@profvjreddi](https://github.com/profvjreddi) **Created:** 6/11/2024 **Status:** ✅ Merged **Merged:** 6/11/2024 **Merged by:** [@profvjreddi](https://github.com/profvjreddi) **Base:** `main` ← **Head:** `dev` --- ### 📝 Commits (2) - [`ebee83b`](https://github.com/harvard-edge/cs249r_book/commit/ebee83bdd8fa6545bc595c47dd76e3aedfaa682b) Fix merge error causing build failures - [`01ce951`](https://github.com/harvard-edge/cs249r_book/commit/01ce951de93ebc55ed16d335fdf3a4f3d049f41f) Update readme and contributors.qmd with contributors ### 📊 Changes **4 files changed** (+196 additions, -186 deletions) <details> <summary>View changed files</summary> 📝 `.all-contributorsrc` (+134 -127) 📝 `README.md` (+31 -28) 📝 `contents/contributors.qmd` (+31 -28) 📝 `contents/hw_acceleration/hw_acceleration.qmd` (+0 -3) </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:06 -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#668