Remove conflict markers

2017-05-29 20:07:57 -05:00 · 2017-05-29 20:07:57 -05:00 · c99e2c8b1f
parent 811c22d1d6
commit c99e2c8b1f
2 changed files with 0 additions and 2 deletions
--- a/src/client.cpp
+++ b/src/client.cpp
@ -206,7 +206,6 @@ const std::vector<ModSpec>& Client::getMods() const
 const ModSpec* Client::getModSpec(const std::string &modname) const
 {
 	return NULL;
->>>>>>> minetest/master
 }

 void Client::Stop()
--- a/src/server.cpp
+++ b/src/server.cpp
@ -2175,7 +2175,6 @@ void Server::fadeSound(s32 handle, float step, float gain)
 		// Play new sound volume on older clients
 		playSound(compat_psound.spec, compat_psound.params);
 	}
->>>>>>> minetest/master
 }

 void Server::sendRemoveNode(v3s16 p, u16 ignore_id,