projects
/
oweals
/
minetest.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
40ce538
)
Fix indentation problem since merge resolution
author
Loïc Blot
<lblot@infopro-digital.com>
Thu, 16 Mar 2017 10:09:06 +0000
(11:09 +0100)
committer
Loïc Blot
<lblot@infopro-digital.com>
Thu, 16 Mar 2017 10:09:06 +0000
(11:09 +0100)
Github merge conflict resolution is not the best with indent
src/script/clientscripting.cpp
patch
|
blob
|
history
diff --git
a/src/script/clientscripting.cpp
b/src/script/clientscripting.cpp
index 1b73fdf0dc2a17f6ee958a80d33c9d588313b4c8..8bf1b68b11631bea53b507e5234ea6d65f9eb938 100644
(file)
--- a/
src/script/clientscripting.cpp
+++ b/
src/script/clientscripting.cpp
@@
-65,5
+65,5
@@
void ClientScripting::InitializeModApi(lua_State *L, int top)
LuaItemStack::Register(L);
StorageRef::Register(L);
- LuaMinimap::Register(L);
+
LuaMinimap::Register(L);
}