Skip to content
GitLab
Unverified Commit 9289a23a authored by Niels Lohmann's avatar Niels Lohmann Committed by GitHub
Browse files

Merge pull request #1643 from kevinlul/develop 

Fix json.hpp compilation issue with other typedefs with same name (Issue #1642)
parents 9a775bcb e616d095
Hide whitespace changes
Inline Side-by-side
Showing
with 22 additions and 12 deletions
+22 -12
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment