From c7412bb437267a85778e4f40513fe2f7ac897970 Mon Sep 17 00:00:00 2001
From: light <1870499383@qq.com>
Date: Thu, 15 Mar 2018 11:00:55 +0800
Subject: [PATCH] conf

---
 git/command.md    | 3 ---
 opencv/install.md | 4 +++-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/git/command.md b/git/command.md
index a654f15..cdb7b87 100644
--- a/git/command.md
+++ b/git/command.md
@@ -1,7 +1,4 @@
-<<<<<<< HEAD
 git submodule update --init --recursive
-=======
 git fetch --all  
 git reset --hard origin/master 
 git pull
->>>>>>> 70752a4e25d402dfc5a853164331ec9601d63a78
diff --git a/opencv/install.md b/opencv/install.md
index 4a9b924..d91dd81 100644
--- a/opencv/install.md
+++ b/opencv/install.md
@@ -18,7 +18,9 @@ mkdir my_build
 cd my_build
 
 ## cmake 中会下载安装一个大文件，网速会很慢
-cmake -D CMAKE_BUILD_TYPE=Release -D CMAKE_INSTALL_PREFIX=/usr/local ..
+cmake -D CMAKE_BUILD_TYPE=Release \
+    -D OPENCV_EXTRA_MODULES_PATH=/home/lab_01/program/opencv_contrib-3.3.0/modules \
+    -D CMAKE_INSTALL_PREFIX=/usr/local ..
 
 sudo make
 sudo make install