Quantcast

Revert "- Config : Clarify recent changes history"

urnati [05-08-23 - 00:03]
Revert "- Config : Clarify recent changes history"

This reverts commit 45b7343b1c42db0972df7571d390fc1d9fb5be1e.

# Conflicts:
#	Titan/TitanConfig.lua
Filename
Titan/TitanConfig.lua
diff --git a/Titan/TitanConfig.lua b/Titan/TitanConfig.lua
index 7089568..7b5a3da 100644
--- a/Titan/TitanConfig.lua
+++ b/Titan/TitanConfig.lua
@@ -35,21 +35,17 @@ local notes = ""
 local changes = ""
 do -- recent change history
 changes = changes
+<<<<<<< HEAD
 	..TitanUtils_GetGoldText("7.00.03.100007 : 2023/05/07\n")
+=======
+	..TitanUtils_GetGoldText("7.00.02.100007 : 2023/03/31\n")
+>>>>>>> parent of 45b7343 (- Config : Clarify recent changes history)
 	..TitanUtils_GetGreenText("Titan : \n")
 	..TitanUtils_GetHighlightText(""
 		.."- Beta Release\n"
 		.."- Update for API changes in 10.1.\n"
 		)
 	.."\n\n"
-	..TitanUtils_GetGoldText("7.00.02.100007 : 2023/04/26\n")
-	..TitanUtils_GetGreenText("Titan : \n")
-	..TitanUtils_GetHighlightText(""
-		.."- Beta Release on Discord\n"
-		.."- Fix for events arriving before Bars initialized.\n"
-		.."- Add localized bar name to the plugin name in right click menu. Green if current Bar or Gold if not\n"
-		)
-	.."\n\n"
 	..TitanUtils_GetGoldText("6.00.16.100100 : 2023/05/03\n")
 	..TitanUtils_GetGreenText("Titan : \n")
 	..TitanUtils_GetHighlightText(""