1
0
mirror of https://github.com/minetest/minetest.git synced 2025-07-01 15:40:23 +02:00

Removing changes

This commit is contained in:
Foghrye4
2016-04-19 21:34:06 +04:00
parent 15b22f9245
commit 6494e33947

View File

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