Fix merge conflicts.

1 files changed, 2 insertions, 2 deletions

diff --git a/src/instrument.cc b/src/instrument.cc
index ee778d7..d246c09 100644
--- a/src/instrument.cc
+++ b/src/instrument.cc
@@ -82,7 +82,7 @@ Sample* Instrument::sample(level_t level, size_t pos)
 
 	if(enable_velocity_randomiser)
 	{
-		float r = (float)std::rand() / (float)RAND_MAX; // random number: [0;1]
+		float r = (float)rand() / (float)RAND_MAX; // random number: [0;1]
 		r -= 0.5; // random number [-0.5;0.5]
 		r *= velocity_randomiser_weight * 2; // ex. random number [-0.1;0.1]
 		level += r;
@@ -121,7 +121,7 @@ Sample* Instrument::sample(level_t level, size_t pos)
 			return NULL;
 		}
 
-		size_t idx = std::rand()%(s.size());
+		size_t idx = rand()%(s.size());
 		sample = s[idx];
 	}