search

netmix / radio-station

Radio Station WordPress Plugin (Open Source)
https://netmix.com
GNU General Public License v3.0
19 stars 14 forks source link

[ Conflict Catcher ] Show Conflict #489

Open crizzdevizz opened 3 months ago

crizzdevizz commented 3 months ago

How fix this? image

tonyzeoli commented 3 months ago

@crizzdevizz Sending this to @majick777 for review.

tonyzeoli commented 1 month ago

@majick777 This hasn't been checked up on. Can you take a look, please?

Looks like the conflict is incorrect.