resolving merge conflict

1 files changed, 0 insertions, 16 deletions

diff --git a/ofxMaxim/examples/windows/ofMaximWindowsVS2008_emptyExample/src/main.cpp b/ofxMaxim/examples/windows/ofMaximWindowsVS2008_emptyExample/src/main.cpp
deleted file mode 100755
index 312c54e..0000000
--- a/ofxMaxim/examples/windows/ofMaximWindowsVS2008_emptyExample/src/main.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-#include "ofMain.h"
-#include "testApp.h"
-#include "ofAppGlutWindow.h"
-
-//========================================================================
-int main( ){
-
-    ofAppGlutWindow window;
-	ofSetupOpenGL(&window, 800,600, OF_WINDOW);			// <-------- setup the GL context
-
-	// this kicks off the running of my app
-	// can be OF_WINDOW or OF_FULLSCREEN
-	// pass in width and height too:
-	ofRunApp( new testApp());
-
-}