9
0
mirror of https://github.com/BX-Team/DivineMC.git synced 2025-12-19 14:59:25 +00:00

merge conflicts

This commit is contained in:
NONPLAYT
2022-11-14 23:43:26 +03:00

View File

@@ -6,7 +6,7 @@
<br>
![GitHub Workflow Status](https://img.shields.io/github/workflow/status/DivineMC/DivineMC/Build%20DivineMC?style=for-the-badge)
[![Discord](https://img.shields.io/discord/1035686166403493898?color=5865F2&label=discord&style=for-the-badge)](https://discord.gg/PrKTKfR579)
[![Discord](https://img.shields.io/discord/931595732752953375?color=5865F2&label=discord&style=for-the-badge)](https://discord.gg/PrKTKfR579)
</div>
## Features
@@ -42,4 +42,4 @@ In order to distribute and use this server software, you need a paperclip file:
Patches are licensed under GPL-3.0.
All other files are licensed under MIT.
###### And we dont stealed logo from YatopiaMC!!!
###### And we dont stealed logo from YatopiaMC!!!