解决UOS合并冲突

2023-04-13 10:25:48 +08:00 · 2023-04-13 10:25:48 +08:00 · 6c1ced1617
commit 6c1ced1617
parent 5d511689ec
1 changed files with 0 additions and 3 deletions
--- a/script/gspylib/os/gsplatform.py
+++ b/script/gspylib/os/gsplatform.py
@ -1553,15 +1553,12 @@ class LinuxPlatform(GenericPlatform):
                                        prefixStr, packageVersion,
                                        PAK_UBUNTU,
                                        BIT_VERSION, postfixStr))
-<<<<<<< HEAD
-=======
        elif distname in UNIONTECH:
            fileName = os.path.join(dirName, "./../../../",
                                    "%s-%s-%s-%s.%s" % (
                                        prefixStr, packageVersion,
                                        PAK_UNIONTECH,
                                        BIT_VERSION, postfixStr))
->>>>>>> 12441ba (opengauss适配uos系统)
        else:
            raise Exception(ErrorCode.GAUSS_519["GAUSS_51900"] +
                            "Supported platforms are: %s." % str(