resolving merge conflict

1 files changed, 7 insertions, 4 deletions

diff --git a/maximilian_examples/6.FM2.cpp b/maximilian_examples/6.FM2.cpp
index d9acd72..4c6ec8a 100755
--- a/maximilian_examples/6.FM2.cpp
+++ b/maximilian_examples/6.FM2.cpp
@@ -1,14 +1,17 @@
+// Nothing much to say about this other than I like it.
+
 #include "maximilian.h"
 
 maxiOsc mySine,myOtherSine,myLastSine,myPhasor;//Three oscillators
 
 
 void setup() {//some inits
-	//nothing to go here this time	
+    //nothing to go here this time
 }
 
 void play(double *output) {
-	
-	*output=mySine.sinewave(myOtherSine.sinewave(myLastSine.sinewave(0.1)*30)*440);//awesome bassline
-	
+    
+    output[0]=mySine.sinewave(myOtherSine.sinewave(myLastSine.sinewave(0.1)*30)*440);//awesome bassline
+    output[1]=output[0];
+
 }