From c7aae008ad818f9cb453ce184673e0edf8ba4e58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Nusser?= <andre.nusser@googlemail.com>
Date: Thu, 31 Mar 2016 18:00:18 +0200
Subject: Fix build errors due to rebase.

---
 src/velocity.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/velocity.h')

diff --git a/src/velocity.h b/src/velocity.h
index 41622d3..19284a4 100644
--- a/src/velocity.h
+++ b/src/velocity.h
@@ -37,7 +37,7 @@ public:
 	Velocity(unsigned int lower, unsigned int upper);
 
 	void addSample(Sample* sample, float probability);
-	Sample* getSample() const;
+	Sample* getSample();
 
 	unsigned int lower;
 	unsigned int upper;
-- 
cgit v1.2.3