Fix more conflicts
authorMirio <opivy@hotmail.de>
Wed, 25 Apr 2018 14:23:57 +0000 (16:23 +0200)
committerMirio <opivy@hotmail.de>
Wed, 25 Apr 2018 14:23:57 +0000 (16:23 +0200)
commit80fe939b9c6f1c24dda962d3486a3c5f5b2c4cd2
tree320aec27e4b2d1a339c7d45bc3d7b7ef7918315d
parentc466fd706fa70b10e4a4089aa4a6852537691276
parent352fd415bce67dd913f2b98acc36177d22c5b38f
Fix more conflicts
scripts/entities.ent