testing conflicting changes

diff --git a/hello-world.cpp b/hello-world.cpp
index 1e19b02cf6463ae338b8873aff50547f9557831c..84919be17ceddf0c675abf93c31c550ab01a48d0 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.  conflicting change on this line
 int main( int argc, char** argv )
 {
        CvHaarClassifierCascade* cascade = load_object_detector(argv[1]);