9
0
mirror of https://github.com/BX-Team/DivineMC.git synced 2025-12-20 07:19:23 +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> <br>
![GitHub Workflow Status](https://img.shields.io/github/workflow/status/DivineMC/DivineMC/Build%20DivineMC?style=for-the-badge) ![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> </div>
## Features ## Features