diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt index 8d565c30d..ca331ff4e 100644 --- a/builtin/settingtypes.txt +++ b/builtin/settingtypes.txt @@ -241,12 +241,9 @@ send_pre_v25_init (Support older servers) bool true # Save the map received by the client on disk. enable_local_map_saving (Saving map received from server) bool false -<<<<<<< HEAD # Show entity selection boxes show_entity_selectionbox (Show entity selection boxes) bool true -======= ->>>>>>> bca616493783b18b2f280d4773cb4be41d01c434 # Enable usage of remote media server (if provided by server). # Remote servers offer a significantly faster way to download media (e.g. textures) # when connecting to the server.