Merge pull request #1278 from wolfmanjm/upstreamedge
authorJim Morris <morris@wolfman.com>
Mon, 5 Mar 2018 14:50:08 +0000 (14:50 +0000)
committerGitHub <noreply@github.com>
Mon, 5 Mar 2018 14:50:08 +0000 (14:50 +0000)
commitda684624485246f77bd49973c6c3001bdacd116a
tree3db81179f29d8514280dc6ffd5e12bfb0bba65a3
parent8daf94fac989dc7b3f6d46bdc549b5bf4d9147ff
parentb7a1ec7c1a4864602672f59beaf491ce4c002847
Merge pull request #1278 from wolfmanjm/upstreamedge

fix bad formatting from laser PR