tree e45323f33cad018e0c645f6b52014dffbe0e361e
parent 94a38485d6ce366282bbb2d5b8799e678940fd1a
author hsyed <h.a.syed@gmail.com> 1534259420 +0100
committer Hassan Syed <h.a.syed@gmail.com> 1534260294 +0100

tidy up and update the resource merging away from deprecated apis