Merge branch 'main' of https://github.com/Karaha-Baruha/RebornRotations · FFXIV-CombatReborn/RebornRotations@adf5021 · GitHub

This repository has been archived by the owner on Nov 23, 2024. It is now read-only.

Commit

Merge branch 'main' of https://github.com/Karaha-Baruha/RebornRotations

Browse files

# Conflicts:
#	BasicRotations/Ranged/zMCH_Beta.cs

Loading branch information

Karaha-Baruha authored and Karaha-Baruha committed Sep 27, 2024

2 parents f6262fd + 339cdd8 commit adf5021