mirror of
https://github.com/minetest/minetest.git
synced 2024-11-15 23:10:28 +01:00
Removing changes
This commit is contained in:
parent
15b22f9245
commit
6494e33947
|
@ -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.
|
||||
|
|
Loading…
Reference in New Issue
Block a user