Merge branch 'master' of github.com:angularsen/UnitsNet

# Conflicts: # UnitsNet.Serialization.JsonNet.CompatibilityTests/UnitsNet.Serialization.JsonNet.CompatibilityTests.csproj # UnitsNet.Serialization.JsonNet/UnitsNet.Serialization.JsonNet.csproj # UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Power.g.cs # UnitsNet/GeneratedCode/Quantities/Power.g.cs # UnitsNet/UnitsNet.csproj
AgileoAutomation · Jan 8, 2020 · b240e9d · b240e9d
2 parents f737c1a + e69bef4
commit b240e9d
Show file tree

Hide file tree

Showing 122 changed files with 2,593 additions and 213 deletions.
diff --git a/.gitignore b/.gitignore
@@ -261,4 +261,3 @@ Artifacts
 /secure-file
 /Tools/reportgenerator.exe
 /Tools/.store/
-codecov.sh