X-Git-Url: http://challenge-bot.com/repos/?a=blobdiff_plain;f=hello-world.cpp;h=01e749b0c68c533b2dae79e2b23daa6e7d15013c;hb=64bf40b9ce50c0b8bdb4a33111aef9fb77c08ea9;hp=d279d3b140cead1520c09069c02119541b3510a7;hpb=64fb0216edaaf056329e25a4f1362adac9535bd1;p=ozzloy%40gmail.com%2Foble

diff --git a/hello-world.cpp b/hello-world.cpp
index d279d3b..01e749b 100644
--- a/hello-world.cpp
+++ b/hello-world.cpp
@@ -45,7 +45,7 @@ void detect_and_draw_objects( IplImage* image,
 	cvReleaseMemStorage( &storage );
 }
 
-// A Simple Camera Capture Framework
+// A Simple Camera Capture Framework.  serious conflict right here
 int main( int argc, char** argv )
 {
 	CvHaarClassifierCascade* cascade = load_object_detector(argv[1]);