aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabriel Pérez-Cerezo <gabriel@gpcf.eu>2018-02-22 11:06:22 +0100
committerGabriel Pérez-Cerezo <gabriel@gpcf.eu>2018-02-22 11:06:22 +0100
commite22e8ad0b965b42e75b602f4b66012f1392781ca (patch)
tree5d6cbed1c572bee7e1e29e41cdd3d6f1aad5b2e9
parent8ca7325d7ce7b0ce141cea7c607e586654343f86 (diff)
downloadadvtrains-e22e8ad0b965b42e75b602f4b66012f1392781ca.tar.gz
advtrains-e22e8ad0b965b42e75b602f4b66012f1392781ca.tar.bz2
advtrains-e22e8ad0b965b42e75b602f4b66012f1392781ca.zip
fixed unmerged stuff
-rw-r--r--advtrains/wagons.lua5
1 files changed, 0 insertions, 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