Remove missed merge conflict marker.

This commit is contained in:
Dan Albert
2021-04-22 17:49:34 -07:00
parent e32b43cffb
commit 29579a2aec

View File

@@ -6,7 +6,6 @@
## Fixes
>>>>>>> 208d1b82 (Show BARCAP commit ranges by default.)
# 2.5.0
Saves from 2.4 are not compatible with 2.5.