From 15b22f9245734e6fab38bbe7a25ee6934f76d124 Mon Sep 17 00:00:00 2001 From: Foghrye4 Date: Tue, 19 Apr 2016 21:33:14 +0400 Subject: [PATCH] Removing changes --- builtin/mainmenu/common.lua | 4 ---- 1 file changed, 4 deletions(-) diff --git a/builtin/mainmenu/common.lua b/builtin/mainmenu/common.lua index 0cd82a567..b9a010e61 100644 --- a/builtin/mainmenu/common.lua +++ b/builtin/mainmenu/common.lua @@ -290,11 +290,7 @@ end -------------------------------------------------------------------------------- function is_server_protocol_compat(server_proto_min, server_proto_max) -<<<<<<< HEAD - return min_supp_proto <= (server_proto_max or 24) and max_supp_proto >= (server_proto_min or 13) -======= return not ((min_supp_proto > (server_proto_max or 24)) or (max_supp_proto < (server_proto_min or 13))) ->>>>>>> bca616493783b18b2f280d4773cb4be41d01c434 end -------------------------------------------------------------------------------- function is_server_protocol_compat_or_error(server_proto_min, server_proto_max)