resolving merge conflict

1 files changed, 0 insertions, 15 deletions

diff --git a/maximilian_examples/7.Counting.cpp b/maximilian_examples/7.Counting.cpp
deleted file mode 100755
index 7de2f0e..0000000
--- a/maximilian_examples/7.Counting.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-#include "maximilian.h"
-
-maxiOsc myCounter,mySquare;//these oscillators will help us count and play sound
-int CurrentCount;//we're going to put the current count in this variable so that we can use it more easily.
-
-
-void setup() {//some inits
-	//nothing to go here this time	
-}
-
-void play(double *output) {
-	
-	CurrentCount=myCounter.phasor(1, 1, 9);//phasor can take three arguments; frequency, start value and end value.
-	*output=mySquare.square(CurrentCount*100);
-}