Skip to content

Commit

Permalink
fixed merge conflict and corrected formatting issues
Browse files Browse the repository at this point in the history
  • Loading branch information
l-white committed Sep 19, 2023
2 parents d8a898e + 1442e23 commit 93541f9
Showing 1 changed file with 16 additions and 14 deletions.
30 changes: 16 additions & 14 deletions CONTRIBUTORS.md
Original file line number Diff line number Diff line change
Expand Up @@ -8935,38 +8935,40 @@

- [@Hiroki-Sebata](https://github.com/Hiroki-Sebata)

-[@rstallingsiii(https://github.com/rstallingsiii)]
- [@rstallingsiii(https://github.com/rstallingsiii)]

- [@urkensjp](https://github.com/urkensjp)

- [@fengxue8076828](https://github.com/fengxue8076828)

-[@MarriottBL](https://github.com/MarriottBL/)
- [@MarriottBL](https://github.com/MarriottBL/)

-[@Pratibh29](https://github.com/Pratibh29)
- [@Pratibh29](https://github.com/Pratibh29)

-[@avinash-rana-ofc](https://github.com/avinash-rana-ofc)
- [@avinash-rana-ofc](https://github.com/avinash-rana-ofc)

-[@mkumarjha](https://github.com/mkumarjha)
- [@mkumarjha](https://github.com/mkumarjha)

- [@xavierassad](https://github.com/xavierassad)

- [@MarekSabol](https://github.com/MarekSabol)

-[@mirab62807](https://github.com/mirab62807)
- [@mirab62807](https://github.com/mirab62807)

-[@mirab62807](https://github.com/mirab62807)
- [@mirab62807](https://github.com/mirab62807)

-[@Lylepurd](https://github.com/Lylepurd)
- [@Lylepurd](https://github.com/Lylepurd)

-[@Emmanuel-222](https://github.com/Emmanuel-222)
- [@Emmanuel-222](https://github.com/Emmanuel-222)

-[@ianglover28](https://github.com/ianglover28)
- [@ianglover28](https://github.com/ianglover28)

-[@BrinkOfSecondBailout](https://github.com/BrinkOfSecondBailout)
- [@BrinkOfSecondBailout](https://github.com/BrinkOfSecondBailout)

-[@ibaaddurrani](https://github.com/ibaaddurrani)
- [@ibaaddurrani](https://github.com/ibaaddurrani)

-[@Cam87000](https://github.com/Cam87000/)
- [@Cam87000](https://github.com/Cam87000/)

-[AfricaJr](https://github.com/AfricaJr)
- [@Frekeasuquo](https://github.com/frekeasuquo/)

- [AfricaJr](https://github.com/AfricaJr)

0 comments on commit 93541f9

Please sign in to comment.