serious conflicting changes to be merged soon. watchout

diff --git a/hello-world.cpp b/hello-world.cpp
index d279d3b140cead1520c09069c02119541b3510a7..01e749b0c68c533b2dae79e2b23daa6e7d15013c 100644 (file)
--- 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]);