Remove leftover merge conflict markers

This commit is contained in:
Lars Müller 2022-09-01 14:13:56 +02:00 committed by GitHub
parent a91ee25e9b
commit f9b5d6408a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -190,9 +190,5 @@ Minetest provides metadata objects which all provide a simple string key-value s
. Players: xref:classes/PlayerMetaData.adoc[PlayerMetaData]: SQLite-backed key-value storage, however only available while the player is online
. Mods: xref:classes/ModStorage.adoc[ModStorage]: SQLite-backed key-value storage; older versions use a JSON-backed store unsuitable for large data (as serialization will block the main thread)
<<<<<<< HEAD
Utilities for setting & getting non-string datatypes like integers and floats are provided; the datatype is however not stored with the entries.
The granularity of all these key-value stores is determined by the `server_map_save_interval` setting.
=======
TIP: Store only small data in ItemStackMetaRefs. Make sure to limit user input.
>>>>>>> 13da8f0e9024f94f28a5e0c1d4fc42b3d4cd9049