[flang] Fix logical conflict after rebase
authorJean Perier <jperier@nvidia.com>
Wed, 5 Jun 2019 14:33:37 +0000 (07:33 -0700)
committerJean Perier <jperier@nvidia.com>
Wed, 5 Jun 2019 14:33:37 +0000 (07:33 -0700)
commit5b569e209af26d0028acb2251b71c77ec46beb37
tree47493d397a919b1153dbed360c488e5d3ce884f1
parent6dd3ca917a45f5f16e98c8dc318611ab5fd88a0c
[flang] Fix logical conflict after rebase

Original-commit: flang-compiler/f18@93d6c1e53aada0fd6c24b2ba9103ed61d48f7965
Reviewed-on: https://github.com/flang-compiler/f18/pull/471
Tree-same-pre-rewrite: false
flang/lib/evaluate/fold.cc