fix: conflicts

fix: linting fix: resolve conflicts fix: add cip: 23 to frontmatter fix: conflicts
celestiaorg · Jul 19, 2024 · 9bed12c · 9bed12c
1 parent 5231ee9
commit 9bed12c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 0 deletions.
diff --git a/.markdownlint.yaml b/.markdownlint.yaml
@@ -4,3 +4,5 @@
 "MD013": false # Disable rule for line length
 "MD033": false # Disable rule banning inline HTML
 "MD025": false # Disable rule for multiple top-level headers
+"MD040": false # Disable rule for fenced code blocks
+"MD041": false # Disable rule for first line in file
diff --git a/cips/cip-23.md b/cips/cip-23.md
@@ -1,5 +1,6 @@
 ```
 ---
+cip: 23
 title: Coordinated prevote times
 description: Scheduled prevote times for consistent blocks
 author: Callum Waters (@cmwaters)

diff --git a/cips/wgs/zk/README.md b/cips/wgs/zk/README.md
@@ -13,6 +13,9 @@
 | 7 |  May 1, 2024   |                                                      Agenda Link                                                       | Notes Link | [Recording Link](https://drive.google.com/file/d/1qMjamf5Bb0qC0O3J2Ar_EPnw14_6q6os/view?usp=drive_link) |
 | 8 |  May 22, 2024  |                                                      Agenda Link                                                       | Notes Link | [Recording Link](https://drive.google.com/file/d/1m_KAVIkLWYkWxF0iPkKaSByCw5HV-g-q/view?usp=drive_link) |
 | 9 |  May 29, 2024  |                                                      Agenda Link                                                       | Notes Link | [Recording Link](https://drive.google.com/file/d/1bYW8yyL3rcneDDXqwcXMKJxxr7vAHdV0/view?usp=drive_link) |
+| 10 |  June 19, 2024  |                                                      Agenda Link                                                       | Notes Link | [Recording Link](https://drive.google.com/file/d/1qE4Cs94PHN2d2XgocTS3eZvK0DiCtPfh/view?usp=sharing) |
+| 11 |  July 3, 2024  |                                                      Agenda Link                                                       | Notes Link | [Recording Link](https://drive.google.com/file/d/1G3-neciXRTAUPj9whRVw9sCwokdzx8rk/view?usp=drive_link) |
+| 11 |  July 17, 2024  |                                                      Agenda Link                                                       | Notes Link | [Recording Link](https://drive.google.com/file/d/1NUXTr8K_21Kthtf4uGDdjDf6Wlv6uJC9/view?usp=drive_link) |
 
 ## Resources