[flang] fix sloppy merge (sorry)
authorpeter klausler <pklausler@nvidia.com>
Thu, 9 Aug 2018 20:09:33 +0000 (13:09 -0700)
committerpeter klausler <pklausler@nvidia.com>
Thu, 9 Aug 2018 20:09:33 +0000 (13:09 -0700)
commitc2f56d0fb47122b83f9b414fa56c985bfea4bde6
treef2b80ecc75c108bada64453e087ff23d4ddff3b2
parentd86a81343cd9f1f5cce0b2ac8c29753569823abe
[flang] fix sloppy merge (sorry)

Original-commit: flang-compiler/f18@b475721e09969cc5ac287159dbb6e342ce89fa9d
Reviewed-on: https://github.com/flang-compiler/f18/pull/166
flang/lib/semantics/mod-file.cc