HimbeerserverDE
/
barriers
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove merge conflict marker (#1)

master
HimbeerserverDE 2021-02-19 21:15:48 +01:00
parent a1251955ed
commit 5452f696c5
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nodes.lua
View File

@ -1149,13 +1149,9 @@ minetest.register_node("barriers:tl_p_gr_red", {
elseif msg:upper() == "FLASHRED" then
minetest.swap_node(pos, {name = "barriers:tl_p_gr_red", param2 = node.param2})
elseif msg:upper() == "GREEN" then
<<<<<<< HEAD
minetest.swap_node(pos, {name = "barriers:tl_cr_p_green", param2 = node.param2})
minetest.swap_node(pos, {name = "barriers:tl_p_gr_green", param2 = node.param2})
elseif msg:upper() == "GET" then
digiline:receptor_send(pos, tlRules, channel, minetest.get_node(pos).name:split("_")[4])
=======
minetest.swap_node(pos, {name = "barriers:tl_p_gr_green", param2 = node.param2})
>>>>>>> 974ff2986b582254c8347af78a894f7d6ecb317f
end
end
end,