Merge pull request #3088 from xoviat/msvc

author Martin Kroeker <martin@ruby.chemie.uni-freiburg.de>

Sun, 14 Mar 2021 16:14:28 +0000 (17:14 +0100)

committer GitHub <noreply@github.com>

Sun, 14 Mar 2021 16:14:28 +0000 (17:14 +0100)
author Martin Kroeker <martin@ruby.chemie.uni-freiburg.de>
Sun, 14 Mar 2021 16:14:28 +0000 (17:14 +0100)
committer GitHub <noreply@github.com>
Sun, 14 Mar 2021 16:14:28 +0000 (17:14 +0100)
diff --cc .gitignore

index 8674c45,b2c8579..0fe20ec
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -89,6 -89,6 +89,7 @@@ build.
   *.swp
   benchmark/*.goto
   benchmark/smallscaling
+ .vscode
   CMakeCache.txt
   CMakeFiles/*
+ +.vscode
diff --cc appveyor.yml
Simple merge
diff --cc param.h
Simple merge
author	Martin Kroeker <martin@ruby.chemie.uni-freiburg.de>
	Sun, 14 Mar 2021 16:14:28 +0000 (17:14 +0100)
committer	GitHub <noreply@github.com>
	Sun, 14 Mar 2021 16:14:28 +0000 (17:14 +0100)
		1	2
.gitignore	patch \|	diff1 \|	diff2 \|	blob \| history
appveyor.yml	patch \|	diff1 \|	diff2 \|	blob \| history
param.h	patch \|	diff1 \|	diff2 \|	blob \| history