Fixed conflict.

Author: neotron

.github/workflows/toc-update.yml

@@ -12,7 +12,7 @@ jobs:
         uses: actions/checkout@v4.1.1
 
       - name: Update TOC Interface version
-        uses: p3lim/toc-interface-updater@v3
+        uses: p3lim/toc-interface-updater@v4
         with:
           base: retail # this is default
 

MagicMarker.lua

@@ -29,7 +29,7 @@ local MagicComm   = LibStub("MagicComm-1.0")
 local L = LibStub("AceLocale-3.0"):GetLocale("MagicMarker", false)
 
 mod.MAJOR_VERSION = "MagicMarker-1.0"
-mod.MINOR_VERSION = tonumber('@project-revision@') or tonumber(("$Revision$"):match("%d+"))
+mod.MINOR_VERSION = tonumber("@project-date-integer@") or tonumber(date("%Y%m%d%H%M%S"))
 
 -- Upvalue of global functions
 local GetBindingKey = GetBindingKey

MagicMarker.toc

@@ -1,26 +1,27 @@
-## Interface: 110107
-## Interface-Classic: 11404
-## Interface-BCC: 20504
-## Interface-Cata: 40402
-## X-Curse-Project-ID: 14363
-## X-WoWI-ID: 9110
-## X-Wago-ID: ZQ6a2AKW
-## Title: Magic Marker
-## Notes: Automated smart raid marking to speed up trash clearing in instance runs
-## Author: NeoTron
-## Version: 9.0.5
-## DefaultState: enabled
-## X-Category: Raid
-## X-EMail: neotron@gmail.com
-## OptionalDeps: Ace3, MobNotes, LibBabble-Zone-3.0, LibLogger-1.0, MagicComm, LibQTip-1.0, LibDataBroker-1.1, LibDropdown-1.0
-## SavedVariables: MagicMarkerDB, MagicMarkerConfigDB
-
-# Library files
-embeds.xml
-Locales.xml
-MagicMarker.lua
-Config.lua
-MMRaidIcon.lua
-MMCCPrio.lua
-MarkTemplates.lua
-MM_LDB.lua
+## Interface: 100207
+## Interface-Classic: 11404
+## Interface-BCC: 20504
+## Interface-Cata: 40402
+## Interface-Mists: 50500
+## X-Curse-Project-ID: 14363
+## X-WoWI-ID: 9110
+## X-Wago-ID: ZQ6a2AKW
+## Title: Magic Marker
+## Notes: Automated smart raid marking to speed up trash clearing in instance runs
+## Author: NeoTron
+## Version: 1.0-@project-version@
+## DefaultState: enabled
+## X-Category: Raid
+## X-EMail: neotron@gmail.com
+## OptionalDeps: Ace3, MobNotes, LibBabble-Zone-3.0, LibLogger-1.0, MagicComm, LibQTip-1.0, LibDataBroker-1.1, LibDropdown-1.0
+## SavedVariables: MagicMarkerDB, MagicMarkerConfigDB
+
+# Library files
+embeds.xml
+Locales.xml
+MagicMarker.lua
+Config.lua
+MMRaidIcon.lua
+MMCCPrio.lua
+MarkTemplates.lua
+MM_LDB.lua