From: ozzloy <ozzloy@gmail.com>
Date: Sun, 8 Feb 2009 06:03:43 +0000 (-0800)
Subject: testing conflicting changes
X-Git-Url: http://challenge-bot.com/repos/?p=ozzloy%40gmail.com%2Foble;a=commitdiff_plain;h=7ddd74477f2788d32a220bd4eb30d7c1fefdc938

testing conflicting changes
---

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