Skip to content
Commit 087411c0 authored by Matt Wala's avatar Matt Wala
Browse files

Merge branch 'array-context' into 'array-context-tests' 

# Conflicts:
#   pytential/linalg/proxy.py
#   pytential/symbolic/matrix.py
#   test/test_matrix.py
parents 94a220d4 b51f0702
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