resolving merge conflict

1 files changed, 0 insertions, 29 deletions

diff --git a/ofxMaxim/examples/windows/ofxMaximExampleVS2010-OF0072/src/testApp.h b/ofxMaxim/examples/windows/ofxMaximExampleVS2010-OF0072/src/testApp.h
deleted file mode 100644
index e503d85..0000000
--- a/ofxMaxim/examples/windows/ofxMaximExampleVS2010-OF0072/src/testApp.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#pragma once
-
-#include "ofMain.h"
-#include "ofxMaxim.h"
-
-class testApp : public ofBaseApp{
-	public:
-		void setup();
-		void update();
-		void draw();
-		
-		void keyPressed(int key);
-		void keyReleased(int key);
-		void mouseMoved(int x, int y);
-		void mouseDragged(int x, int y, int button);
-		void mousePressed(int x, int y, int button);
-		void mouseReleased(int x, int y, int button);
-		void windowResized(int w, int h);
-		void dragEvent(ofDragInfo dragInfo);
-		void gotMessage(ofMessage msg);
-
-		void audioRequested( float * output, int bufferSize, int nChannels );
-
-		maxiOsc sawOsc;
-		maxiFilter filt;
-		maxiDistortion dist;
-
-
-};