[flang] Merge pull request flang-compiler/f18#166 from flang-compiler/pmk1
authorPeter Klausler <35819229+klausler@users.noreply.github.com>
Thu, 9 Aug 2018 21:16:02 +0000 (14:16 -0700)
committerGitHub <noreply@github.com>
Thu, 9 Aug 2018 21:16:02 +0000 (14:16 -0700)
commit08f08777603d902d16b22492df588e70d1e08268
treef2b80ecc75c108bada64453e087ff23d4ddff3b2
parentc2f56d0fb47122b83f9b414fa56c985bfea4bde6
[flang] Merge pull request flang-compiler/f18#166 from flang-compiler/pmk1

fix sloppy merge (sorry)

Original-commit: flang-compiler/f18@c3957893cbcfc9e00e9f184b4c9bf3251796f5a0
Reviewed-on: https://github.com/flang-compiler/f18/pull/166