Skip to content

Commit

Permalink
resolved merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
sohostory committed Oct 16, 2023
2 parents 127c642 + ea8ee31 commit 2666812
Showing 1 changed file with 5 additions and 9 deletions.
14 changes: 5 additions & 9 deletions CONTRIBUTORS.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@
- [Shaikh Aman](https://github.com/ShaikhAman01)

- [Harsh Singh](https://github.com/HarshSingh2009)

- [0xPew](https://github.com/0xPew)

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

- [Maria Duran] (https://github.com/bduran04)
Expand Down Expand Up @@ -58,8 +56,8 @@

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

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

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

- [@Akash_Jambulkar](https://github.com/Akash-Jambulkar)
Expand Down Expand Up @@ -110,7 +108,7 @@
- [@Jeet-Debnath](https://github.com/jxxt)
[@amitverma147 ](https://github.com/amitverma147)
[@shirshakk](https://github.com/shirshakk)

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

- [@JB-Rockstar](https://github.com/JB-Rockstar)
Expand All @@ -123,7 +121,6 @@

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


- [@Abdifatahsaid](https://github.com/Abdifatah-said/)

- [@Abhishekgoel](https://github.com/abhishek94goel)
Expand Down Expand Up @@ -160,7 +157,6 @@
- [@k-abdo](https://github.com/k-abdo)

- [@Ajaysinghshekhawat](https://github.com/AjaySingh-Shekhawat)

- [@Arpan Chowdhury](https://github.com/apu52)

- [@Ajmccraw](https://github.com/ajmccraw)
Expand Down Expand Up @@ -4016,6 +4012,8 @@

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

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

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

- [@Kerwindows](https://github.com/kerwindows)
Expand Down Expand Up @@ -7548,7 +7546,6 @@
- [@Shirshak89](https://github.com/shirshak89)

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

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

- [@Shivangisharmacs](https://github.com/Shivangi-Sharma-CS/)
Expand Down Expand Up @@ -9670,4 +9667,3 @@
-[@GrizzlyWebDev](https://github.com/GrizzlyWebDev)

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

0 comments on commit 2666812

Please sign in to comment.