Skip to content
Unverified Commit 3d324865 authored by Andreas Klöckner's avatar Andreas Klöckner Committed by GitHub
Browse files

Merge pull request #442 from dzhuang/res_conflicts 

Resolve conflicts for merging #419 into master
parents 90c8fda0 46ff21e3
Hide whitespace changes
Inline Side-by-side
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