[FIX] Conflicts not resolved properly on 4.18.0#3290

diegolmello merged 1 commit into

single-serverRocketChat/Rocket.Chat.ReactNative:single-serverfrom

fix.remove-server-listRocketChat/Rocket.Chat.ReactNative:fix.remove-server-listCopy head branch name to clipboard