HwangKC 2024-09-14 22:54:17 +08:00
parent 0a14ee1735
commit 5b71d4c465
1 changed files with 5 additions and 0 deletions

5
.gitignore vendored
View File

@ -3,6 +3,11 @@
/appRelease/test.release /appRelease/test.release
/sdk/include/SQLiteCpp /sdk/include/SQLiteCpp
/appRelease/mysql/mysql-arm.tar /appRelease/mysql/mysql-arm.tar
<<<<<<< HEAD
/applications/examples/jsondemo2/x64 /applications/examples/jsondemo2/x64
/applications/examples/jsondemo2/jsondemo2.vcxproj.filters /applications/examples/jsondemo2/jsondemo2.vcxproj.filters
/applications/examples/jsondemo2/jsondemo2.vcxproj.user /applications/examples/jsondemo2/jsondemo2.vcxproj.user
=======
/applications/ems_datahubs/.vs
/applications/ems_datahubs/obj
>>>>>>> bce2956dae20109467a3385b24f36983f0e31914