resolving merge conflict

1 files changed, 0 insertions, 43 deletions

diff --git a/ofxMaxim/examples/iOS/ofxMaximiPhone007Example/src/testApp.h b/ofxMaxim/examples/iOS/ofxMaximiPhone007Example/src/testApp.h
deleted file mode 100755
index 0bf924f..0000000
--- a/ofxMaxim/examples/iOS/ofxMaximiPhone007Example/src/testApp.h
+++ /dev/null
@@ -1,43 +0,0 @@
-#pragma once
-
-#include "ofMain.h"
-#include "ofxiPhone.h"
-#include "ofxiPhoneExtras.h"
-#include "ofxMaxim.h"
-
-
-class testApp : public ofxiPhoneApp {
-	
-public:
-	~testApp();
-	void setup();
-	void update();
-	void draw();
-	void exit();
-	
-	void touchDown(ofTouchEventArgs &touch);
-	void touchMoved(ofTouchEventArgs &touch);
-	void touchUp(ofTouchEventArgs &touch);
-	void touchDoubleTap(ofTouchEventArgs &touch);
-	void touchCancelled(ofTouchEventArgs &touch);
-
-	void lostFocus();
-	void gotFocus();
-	void gotMemoryWarning();
-	void deviceOrientationChanged(int newOrientation);
-	
-	void audioReceived( float * input, int bufferSize, int nChannels );
-	void audioRequested( float * output, int bufferSize, int nChannels );
-	
-	int		initialBufferSize;
-	int		sampleRate;
-	
-	
-	ofxMaxiOsc myOsc1;
-	ofxMaxiSample sample1;
-	double patch1,sample,outputs1[2];
-	ofxMaxiMix channel1;
-
-};
-
-