Sneederix/sneedmc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

forgor a conflict

Browse Source 
Signed-off-by: sneedium <sneed@sneedmc.org>
This commit is contained in:
sneedium 2022-06-19 11:49:28 -04:00
parent cb1b9782eb
commit afe8b1f11d
Signed by: sneedium
GPG Key ID: 906F66490FBE722F
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -137,11 +137,7 @@ Feel free to create an issue if you need help. However, you might find it easier
For people who don't want to use Discord, we have a Matrix Space which is bridged to the Discord server: For people who don't want to use Discord, we have a Matrix Space which is bridged to the Discord server:
<<<<<<< HEAD
[![SneedMC Space](https://img.shields.io/matrix/polymc:polymc.org?label=SneedMC%20Space&server_fqdn=matrix.polymc.org)](https://matrix.to/#/#polymc:polymc.org) [![SneedMC Space](https://img.shields.io/matrix/polymc:polymc.org?label=SneedMC%20Space&server_fqdn=matrix.polymc.org)](https://matrix.to/#/#polymc:polymc.org)
=======
[![PolyMC Space](https://img.shields.io/matrix/polymc:matrix.org?label=PolyMC%20space)](https://matrix.to/#/#polymc:matrix.org)
>>>>>>> upstream/develop
If there are any issues with the space or you are using a client that does not support the feature here are the individual rooms: If there are any issues with the space or you are using a client that does not support the feature here are the individual rooms: