Fix conflict
This commit is contained in:
commit
62272f3df6
3 changed files with 677 additions and 1 deletions
3
.gitignore
vendored
3
.gitignore
vendored
|
@ -5,4 +5,5 @@ CMakeFiles/*
|
|||
cmake_install.cmake
|
||||
CMakeCache.txt
|
||||
Libraries_src/*
|
||||
Makefile
|
||||
Makefile
|
||||
|
||||
|
|
Reference in a new issue