Skip to content
Commit b55c339c authored by Frans Allen's avatar Frans Allen
Browse files

fix conflicts on technologies.json

parents 6b17342c 71cd45a2
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment