[DiscordArchive] So basically just remove the duplicate and (re)build?
[DiscordArchive] So basically just remove the duplicate and (re)build?
Archived author: Barrow • Posted: 2023-10-22T21:05:37.166000+00:00
Original source
So basically just remove the duplicate and (re)build?
Archived author: jackpoz • Posted: 2023-10-22T21:05:58.903000+00:00
Original source
not really, basically literally solving git merge conflicts
Archived author: Barrow • Posted: 2023-10-22T21:06:04.513000+00:00
Original source
Well i'm terribly sorry for asking this here btw, figured it was Trinity with Eluna merged
Archived author: Barrow • Posted: 2023-10-22T21:06:22.468000+00:00
Original source
So the main core is still Trinity
Archived author: jackpoz • Posted: 2023-10-22T21:06:47.755000+00:00
Original source
we try to keep those custom changes in <#870722120458600528>
Archived author: jackpoz • Posted: 2023-10-22T21:07:16.691000+00:00
Original source
as quite a good chunk of the community uses different versions of TC and not just the original one
Archived author: Barrow • Posted: 2023-10-22T21:07:27.119000+00:00
Original source
I'm sorry for being in the wrong section then my guys
Archived author: jackpoz • Posted: 2023-10-22T21:07:31.537000+00:00
Original source
chances are Eluna changed the same lines that TC changed too
Archived author: jackpoz • Posted: 2023-10-22T21:07:39.186000+00:00
Original source
no worries
Archived author: Barrow • Posted: 2023-10-22T21:08:06.727000+00:00
Original source
Tomorrow i'll delete the duplicatio' and try and resolve the git conflicts