[SCM] vamp-plugin-sdk/master: Resolve merge conflict

[mira-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit d7a28deca1bcb42c3a4ab24cf9594bac08fab6d2
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Mon Oct 29 18:49:42 2012 +0100

    Resolve merge conflict

diff --git a/examples/FixedTempoEstimator.cpp b/examples/FixedTempoEstimator.cpp
index 1871977..a7ea1ee 100644
--- a/examples/FixedTempoEstimator.cpp
+++ b/examples/FixedTempoEstimator.cpp
@@ -45,10 +45,7 @@ using Vamp::RealTime;
 
 #include <cmath>
 #include <cstdio>
-<<<<<<< HEAD
-=======
 
->>>>>>> upstream/2.4
 
 class FixedTempoEstimator::D
 // this class just avoids us having to declare any data members in the header

-- 
vamp-plugin-sdk packaging