Skip to content

Commit

Permalink
Resolve conflicts with main
Browse files Browse the repository at this point in the history
  • Loading branch information
shyam-patel-kira committed Apr 9, 2024
2 parents a887bb6 + ce0e88f commit 8ae358a
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 2 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/md-lint.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
name: Markdown linter

on:
pull_request:
branches:
Expand Down
1 change: 1 addition & 0 deletions docs/_sidebar.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
- [Week 7 | Dev](/eps/week7-dev.md)
- [Week 7 | Research](/eps/week7-research.md)
- [Week 8 | Dev](/eps/week8-dev.md)
- [Week 8 | Research](/eps/week8-research.md)

- [Contributing](contributing.md)
- **Protocol Wiki**
Expand Down
Binary file added docs/eps/presentations/week8-dev.pdf
Binary file not shown.
4 changes: 2 additions & 2 deletions docs/eps/week8-research.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Before starting with the week 8 development content, make yourself familiar with
Additionally, you can get ready by studying the following resources:

- [MEV basics](https://ethereum.org/en/developers/docs/mev/)
- [RIG projects](https://ethereum.github.io/rig/)
- [RIG projects](https://rig.ethereum.org/)
- [Wiki on MEV and PBS](https://github.com/eth-protocol-fellows/protocol-studies/tree/pbs/docs/wiki/research/PBS)

## Outline
Expand All @@ -26,4 +26,4 @@ Additionally, you can get ready by studying the following resources:
## Additional reading and exercises

- [Rig Open Problems](https://efdn.notion.site/RIG-Open-Problems-ROPs-c11382c213f949a4b89927ef4e962adf)
- [Censorship stats](https://dotpics.info/)
- [Censorship stats](https://dotpics.info/)

0 comments on commit 8ae358a

Please sign in to comment.