fix: merge conflict

RSS3-Network · Oct 15, 2024 · fd5954d · fd5954d
1 parent ecf0ef9
commit fd5954d
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -12,8 +12,8 @@ This repository tracks all REPs proposed by the RSS3 Community.
 | [REP-11](./REPs/REP-11.md) | Protocol Upgrade                               | [BruceXC](mailto:xichang1510@gmail.com), [HenryQW](mailto:hi@henry.wang), [KallyDev](mailto:kallydev@gmail.com), [Nya Candy](mailto:github@candinya.com), [polebug](mailto:polebugfly@gmail.com), [pseudoyu](mailto:pseudoyu@connect.hku.hk), [Thomas](mailto:73341653+naaive@users.noreply.github.com) | Protocol | Final     |
 | [REP-16](./REPs/REP-16.md) | Staking Rewards Taxation Adjustment            | [Albert](mailto:iavl@proton.me), [HenryQW](mailto:hi@henry.wang)                                                                                                                                                                                                                                        | Core     | Final     |
 | [REP-20](./REPs/REP-20.md) | Data Availability Layer Integration            | [Albert](mailto:iavl@proton.me), [HenryQW](mailto:hi@henry.wang)                                                                                                                                                                                                                                        | Core     | Final     |
-| [REP-26](./REPs/REP-26.md) | Chip Mechanism Upgrade                         | [BruceXC](mailto:xichang1510@gmail.com)                                                                                                                                                                                                                                                                 | Core     | Final |
-| [REP-33](./REPs/REP-33.md) | Node State Transition                          | [KallyDev](mailto:kallydev@rss3.io), [BruceXC](mailto:xichang1510@gmail.com)                                                                                                                                                                                                                            | Core     | Review     |
+| [REP-26](./REPs/REP-26.md) | Chip Mechanism Upgrade                         | [BruceXC](mailto:xichang1510@gmail.com)                                                                                                                                                                                                                                                                 | Core     | Final     |
+| [REP-33](./REPs/REP-33.md) | Node State Transition                          | [KallyDev](mailto:kallydev@rss3.io), [BruceXC](mailto:xichang1510@gmail.com)                                                                                                                                                                                                                            | Core     | Review    |
 | [REP-38](./REPs/REP-38.md) | Demotion and Slashing Mechanism                | [Polebug](mailto:polebug@rss3.io)                                                                                                                                                                                                                                                                       | Core     | Draft     |
 | [REP-40](./REPs/REP-40.md) | Whitepaper Updates                             | [pseudoyu](mailto:pseudoyu@connect.hku.hk)                                                                                                                                                                                                                                                              | Core     | Candidate |
 | [REP-43](./REPs/REP-43.md) | Introducing Payment Processor for Request Fees | [Nya Candy](mailto:dev@candinya.com)                                                                                                                                                                                                                                                                    | Core     | Review    |