Skip to content

Commit

Permalink
fixed cherry-pick
Browse files Browse the repository at this point in the history
  • Loading branch information
nyyr committed Jun 10, 2021
1 parent 8cf8ddb commit 6cfd42e
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions Core.lua
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,9 @@ ArcHUD.codename = "Pandemic"
ArcHUD.authors = "nyyr, Nenie"

-- Classic specifics
<<<<<<< HEAD
ArcHUD.classic = false
=======
ArcHUD.isClassicWoW = (WOW_PROJECT_ID == WOW_PROJECT_CLASSIC)
ArcHUD.isClassicTbc = (WOW_PROJECT_ID == WOW_PROJECT_BURNING_CRUSADE_CLASSIC)
ArcHUD.classic = ArcHUD.isClassic or ArcHUD.isClassicTbc
>>>>>>> 7efde2d... classic-tbc changes
ArcHUD.UnitCastingInfo = UnitCastingInfo
ArcHUD.UnitChannelInfo = UnitChannelInfo

Expand Down

0 comments on commit 6cfd42e

Please sign in to comment.