Compare commits

..

No commits in common. "5b71d4c4653038184b8bf26e56865db068db5082" and "bce2956dae20109467a3385b24f36983f0e31914" have entirely different histories.

1 changed files with 0 additions and 6 deletions

6
.gitignore vendored
View File

@ -3,11 +3,5 @@
/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/jsondemo2.vcxproj.filters
/applications/examples/jsondemo2/jsondemo2.vcxproj.user
=======
/applications/ems_datahubs/.vs /applications/ems_datahubs/.vs
/applications/ems_datahubs/obj /applications/ems_datahubs/obj
>>>>>>> bce2956dae20109467a3385b24f36983f0e31914