From e22e8ad0b965b42e75b602f4b66012f1392781ca Mon Sep 17 00:00:00 2001 From: Gabriel Pérez-Cerezo Date: Thu, 22 Feb 2018 11:06:22 +0100 Subject: fixed unmerged stuff --- advtrains/wagons.lua | 5 ----- 1 file changed, 5 deletions(-) diff --git a/advtrains/wagons.lua b/advtrains/wagons.lua index b30c5b5..2dce41b 100644 --- a/advtrains/wagons.lua +++ b/advtrains/wagons.lua @@ -1123,13 +1123,8 @@ function wagon:safe_decouple(pname) minetest.chat_send_player(pname, "Couple is locked (ask owner or admin to unlock it)") return false end -<<<<<<< HEAD - advtrains.log("Discouple", pname, self.object:getpos(), self:train().text_outside) - atprint("wagon:discouple() Splitting train", selftrain_id) -======= atprint("wagon:discouple() Splitting train", self.train_id) advtrains.log("Discouple", pname, self.object:getpos(), self:train().text_outside) ->>>>>>> 481f6218a8b377a0826b7e080046b5a890702e12 advtrains.split_train_at_wagon(self)--found in trainlogic.lua return true end -- cgit v1.2.3