resolving merge conflict

1 files changed, 0 insertions, 2 deletions

diff --git a/player.cpp b/player.cpp
index 51ae4fb..4813dfc 100644
--- a/player.cpp
+++ b/player.cpp
@@ -27,8 +27,6 @@ void setup();//use this to do any initialisation if you want.
 
 void play(double *output);//run dac! Very very often. Too often in fact. er...
 
-
-
 #ifdef MAXIMILIAN_PORTAUDIO
 int routing(const void *inputBuffer,
 		void *outputBuffer,