fix conficts

.gitignore

@@ -1,17 +1,265 @@
-################################################################################
-# This .gitignore file was automatically created by Microsoft(R) Visual Studio.
-################################################################################
+#################
+## Eclipse
+#################
 
-/.vs/Microsoft.VisualBasic.Core/v15/Server/sqlite3
-*.suo
+*.pydevproject
+.project
+.metadata
 bin/
-Debug/
-Release/
-obj/
-*.dtbcache
-/.vs/Microsoft.VisualBasic.NET47/v15/Server/sqlite3
+tmp/
+*.tmp
+*.bak
+*.swp
+*~.nib
+local.properties
+.classpath
+.settings/
+.loadpath
+
+storage.ide
+storage.ide-journal
+
+# External tool builders
+.externalToolBuilders/
+
+# Locally stored "Eclipse launch configurations"
+*.launch
+
+# CDT-specific
+.cproject
+
+# PDT-specific
+.buildpath
+
+
+packages/
+
+#################
+## Visual Studio
+#################
+
+## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+
+# User-specific files
+*.suo
+*.user
+*.sln.docstates
+
+slnx.sqlite-journal
+slnx.sqlite
+bin-Debug/
+GCModeller-[Xx]64/
+
+# Build results
+
+[Dd]ebug/
+[Rr]elease/
+x64/
+build/
+[Bb]in/
+[Oo]bj/
+.svn/
+
+# MSTest test Results
+[Tt]est[Rr]esult*/
+[Bb]uild[Ll]og.*
+
+*_i.c
+*_p.c
+*.ilk
+*.meta
+*.obj
+*.pch
+*.pdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.tmp_proj
+*.log
+*.vspscc
+*.vssscc
+.builds
+*.pidb
+*.log
+*.scc
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opensdf
+*.sdf
+*.cachefile
+
+# Visual Studio profiler
+*.psess
+*.vsp
+*.vspx
+
+# Guidance Automation Toolkit
+*.gpState
+
+# ReSharper is a .NET coding add-in
+_ReSharper*/
+*.[Rr]e[Ss]harper
+
+# TeamCity is a build add-in
+_TeamCity*
+
+# DotCover is a Code Coverage Tool
+*.dotCover
+
+# NCrunch
+*.ncrunch*
+.*crunch*.local.xml
+
+# Installshield output folder
+[Ee]xpress/
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish/
+
+# Publish Web Output
+*.Publish.xml
+*.pubxml
+*.publishproj
+
+# NuGet Packages Directory
+## TODO: If you have NuGet Package Restore enabled, uncomment the next line
+#packages/
+
+# Windows Azure Build Output
+csx
+*.build.csdef
+
+# Windows Store app package directory
+AppPackages/
+
+# Others
+sql/
+*.Cache
+ClientBin/
+[Ss]tyle[Cc]op.*
+~$*
+*~
+*.dbmdl
+*.[Pp]ublish.xml
+*.pfx
+*.publishsettings
+
+# RIA/Silverlight projects
+Generated_Code/
+
+# Backup & report files from converting an old project file to a newer
+# Visual Studio version. Backup files are not needed, because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+UpgradeLog*.htm
+
+# SQL Server files
+App_Data/*.mdf
+App_Data/*.ldf
+
+#############
+## Windows detritus
+#############
+
+# Windows image file caches
+Thumbs.db
+ehthumbs.db
+
+# Folder config file
+Desktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+# Mac crap
+.DS_Store
+
+
+#############
+## Python
+#############
+
+*.py[cod]
+
+# Packages
+*.egg
+*.egg-info
+dist/
+build/
+eggs/
+parts/
+var/
+sdist/
+develop-eggs/
+.installed.cfg
+
+# Installer logs
+pip-log.txt
+
+# Unit test / coverage reports
+.coverage
+.tox
+
+#Translations
+*.mo
+
+#Mr Developer
+.mr.developer.cfg
+/CLI_tools/App
+/CLI_tools/App
+/GCModeller/GCModeller
+/GCModeller/GCModeller
+/GCModeller/GCModeller/Microsoft.VisualBasic.Architecture.Framework_v3.0_22.0.76.201__8da45dcd8060cc9a.dll.config
+/Data_science/Mathematica/Plot/.vs/PlotTools/v15/sqlite3/storage.ide-journal
+/mime/.vs/xlsx/v15/sqlite3/storage.ide-journal
+
+/.vs/installer
+/vs_solutions/installer/bootstrap/Resources/Microsoft.VisualBasic.Architecture.Framework_v3.0_22.0.76.201__8da45dcd8060cc9a.xml
+/vs_solutions/installer/bootstrap/Resources/Microsoft.VisualBasic.Architecture.Framework_v3.0_22.0.76.201__8da45dcd8060cc9a.dll.config
+/vs_solutions/installer/bootstrap/Resources/Microsoft.VisualBasic.Architecture.Framework_v3.0_22.0.76.201__8da45dcd8060cc9a.dll
+/vs_solutions/installer/bootstrap/Resources/installer.zip
+/vs_solutions/installer/bootstrap/Resources/Installer.xml
+/vs_solutions/installer/bootstrap/Resources/Installer.exe.config
+/vs_solutions/installer/bootstrap/Resources/Installer.exe
+/vs_solutions/installer/Installer/Resources/installer.zip
+/vs_solutions/installer/output
+/vs_solutions/installer/bootstrap/Resources/Resources.zip
+/Microsoft.VisualBasic.Architecture.Framework/.vs
+/Data_science/Mathematica/Plot/.vs/PlotTools/v15/Server/sqlite3/db.lock
 
 db.lock
-*.ide
-*.ide-shm
+storage.ide-shm
+storage.ide-wal
+/vs_solutions/installer/utils
+
+*.lock
 *.ide-wal
+*.ide-shm
+/vs_solutions/installer/bootstrap/Resources/Microsoft.VisualBasic.Framework_v47_dotnet_8da45dcd8060cc9a.xml
+/vs_solutions/installer/bootstrap/Resources/Microsoft.VisualBasic.Framework_v47_dotnet_8da45dcd8060cc9a.dll.config
+/vs_solutions/installer/bootstrap/Resources/Microsoft.VisualBasic.Framework_v47_dotnet_8da45dcd8060cc9a.dll
+/CLI_tools/LicenseMgr/App
+/vs_solutions/dev/LicenseMgr/App
+*.dtbcache
+/www/data/github/App
+/gr/3DEngineTest/App

.vs/ProjectSettings.json

@@ -0,0 +1,3 @@
+{
+  "CurrentProjectSetting": null
+}