[LyX/master] Use || instead of or operator

[Jean-Marc Lasgouttes]

commit 32d6396f88da6e8537e45a2acaa42cdf361df488
Author: Jean-Marc Lasgouttes <lasgout...@lyx.org>
Date:   Thu Feb 28 12:03:34 2019 +0100

    Use || instead of or operator
    
    It is more consistent and visual studio seems to dislike it anyway.
---
 src/BufferParams.cpp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp
index 60bfa3a..fc4ac4a 100644
--- a/src/BufferParams.cpp
+++ b/src/BufferParams.cpp
@@ -3290,7 +3290,7 @@ void BufferParams::writeEncodingPreamble(otexstream & os,
                        break;
                }
        }
-       if (inputenc == "default" or features.isRequired("japanese")) {
+       if (inputenc == "default" || features.isRequired("japanese")) {
                // don't default to [utf8]{inputenc} with TeXLive >= 18
                os << "\\ifdefined\\UseRawInputEncoding\n";
                os << "  \\UseRawInputEncoding\\fi\n";