From 64bf40b9ce50c0b8bdb4a33111aef9fb77c08ea9 Mon Sep 17 00:00:00 2001
From: ozzloy <ozzloy@gmail.com>
Date: Sat, 7 Feb 2009 22:04:21 -0800
Subject: [PATCH 1/1] serious conflicting changes to be merged soon.  watchout

---
 hello-world.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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]);
-- 
2.30.2