Merge branch 'master' into 'opencv'

# Conflicts: # projects/opencv/imports.yml

Merge branch 'master' into 'opencv'
# Conflicts: # projects/opencv/imports.yml
4b38761e · Miykael_xxm · 615c2a0a · 0c4c2eea · 4b38761e
显示空白变更内容
内联并排

Showing with 1 addition and 2 deletion

projects/opencv/imports.yml projects/opencv/imports.yml +1 -2

未找到文件。
--- a/projects/opencv/imports.yml
+++ b/projects/opencv/imports.yml
@@ -47,4 +47,3 @@ group:
    description: 'For historical needs only. All exported SVN history with metadata.'
    mirrorRelease: false
    topic: ''
+\ No newline at end of file
-  
\ No newline at end of file