zhuyijun/CStudy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	base/CMakeLists.txt
#	base/class/stock00.cpp
#	base/class/stock10.h
This commit is contained in:
zhuyijun 2021-08-17 20:04:23 +08:00
commit 5125020ca4
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
base/CMakeLists.txt
View File

@ -47,14 +47,6 @@ add_executable(external namespacetest/external.cpp)
add_executable(support namespacetest/support.cpp)
add_executable(ststic namespacetest/ststic.cpp)
add_executable(newplace namespacetest/newplace.cpp)
<<<<<<< HEAD
add_executable(namessp namespacetest/namessp.cpp)
add_executable(usestock0 class/usestock0.cpp)
add_executable(stock20 class/stock20.cpp)
add_executable(useStock20 class/useStock20.cpp)
=======
add_executable(namessp namespacetest/namessp.cpp)
>>>>>>> parent of 39fe553 (添加对象)
=======
add_executable(namessp namespacetest/namessp.cpp)
>>>>>>> parent of 39fe553 (添加对象)
add_executable(useStock20 class/useStock20.cpp)