/tmp/tone/run/jtreg/jdk-repo/test/jdk/javax/naming/module/RunBasic.java:137: error: illegal start of expression
<<<<<<< HEAD
^
/tmp/tone/run/jtreg/jdk-repo/test/jdk/javax/naming/module/RunBasic.java:137: error: illegal start of expression
<<<<<<< HEAD
  ^
/tmp/tone/run/jtreg/jdk-repo/test/jdk/javax/naming/module/RunBasic.java:137: error: illegal start of expression
<<<<<<< HEAD
    ^
/tmp/tone/run/jtreg/jdk-repo/test/jdk/javax/naming/module/RunBasic.java:138: error: > expected
        runJava("-Dtest.src=" + TEST_SRC, "-p", "mods", "-m", "test/" + clsName,
        ^
/tmp/tone/run/jtreg/jdk-repo/test/jdk/javax/naming/module/RunBasic.java:140: error: illegal start of expression
||||||| 82c330b464
^
/tmp/tone/run/jtreg/jdk-repo/test/jdk/javax/naming/module/RunBasic.java:140: error: illegal start of expression
||||||| 82c330b464
  ^
/tmp/tone/run/jtreg/jdk-repo/test/jdk/javax/naming/module/RunBasic.java:140: error: illegal start of expression
||||||| 82c330b464
    ^
/tmp/tone/run/jtreg/jdk-repo/test/jdk/javax/naming/module/RunBasic.java:140: error: illegal start of expression
||||||| 82c330b464
      ^
/tmp/tone/run/jtreg/jdk-repo/test/jdk/javax/naming/module/RunBasic.java:140: error: ';' expected
||||||| 82c330b464
          ^
/tmp/tone/run/jtreg/jdk-repo/test/jdk/javax/naming/module/RunBasic.java:141: error: ';' expected
        runJava("-Dtest.src=" + TEST_SRC, "-p", "mods", "-m", "test/" + clsName,
               ^
/tmp/tone/run/jtreg/jdk-repo/test/jdk/javax/naming/module/RunBasic.java:141: error: not a statement
        runJava("-Dtest.src=" + TEST_SRC, "-p", "mods", "-m", "test/" + clsName,
                                ^
/tmp/tone/run/jtreg/jdk-repo/test/jdk/javax/naming/module/RunBasic.java:141: error: ';' expected
        runJava("-Dtest.src=" + TEST_SRC, "-p", "mods", "-m", "test/" + clsName,
                                        ^
/tmp/tone/run/jtreg/jdk-repo/test/jdk/javax/naming/module/RunBasic.java:141: error: not a statement
        runJava("-Dtest.src=" + TEST_SRC, "-p", "mods", "-m", "test/" + clsName,
                                                                        ^
/tmp/tone/run/jtreg/jdk-repo/test/jdk/javax/naming/module/RunBasic.java:141: error: ';' expected
        runJava("-Dtest.src=" + TEST_SRC, "-p", "mods", "-m", "test/" + clsName,
                                                                               ^
/tmp/tone/run/jtreg/jdk-repo/test/jdk/javax/naming/module/RunBasic.java:143: error: illegal start of expression
=======
^
/tmp/tone/run/jtreg/jdk-repo/test/jdk/javax/naming/module/RunBasic.java:143: error: illegal start of expression
=======
  ^
/tmp/tone/run/jtreg/jdk-repo/test/jdk/javax/naming/module/RunBasic.java:143: error: illegal start of expression
=======
    ^
/tmp/tone/run/jtreg/jdk-repo/test/jdk/javax/naming/module/RunBasic.java:143: error: illegal start of expression
=======
      ^
/tmp/tone/run/jtreg/jdk-repo/test/jdk/javax/naming/module/RunBasic.java:145: error: illegal start of expression
>>>>>>> cee8535a9d3de8558b4b5028d68e397e508bef71
^
/tmp/tone/run/jtreg/jdk-repo/test/jdk/javax/naming/module/RunBasic.java:145: error: illegal start of expression
>>>>>>> cee8535a9d3de8558b4b5028d68e397e508bef71
   ^
/tmp/tone/run/jtreg/jdk-repo/test/jdk/javax/naming/module/RunBasic.java:145: error: illegal start of expression
>>>>>>> cee8535a9d3de8558b4b5028d68e397e508bef71
      ^
/tmp/tone/run/jtreg/jdk-repo/test/jdk/javax/naming/module/RunBasic.java:145: error: ';' expected
>>>>>>> cee8535a9d3de8558b4b5028d68e397e508bef71
                                                ^
22 errors

TEST RESULT: Failed. Compilation failed: Compilation failed