fix conflict

Accelerator1996 · Jul 11, 2024 · 77eddd6 · 77eddd6
1 parent 483590a
commit 77eddd6
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 8 deletions.
diff --git a/make/autoconf/flags-cflags.m4 b/make/autoconf/flags-cflags.m4
@@ -580,13 +580,8 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_HELPER],
   # CFLAGS WARNINGS STUFF
   # Set JVM_CFLAGS warning handling
   if test "x$TOOLCHAIN_TYPE" = xgcc; then
-<<<<<<< HEAD
     WARNING_CFLAGS_JDK="-Wall -Wextra -Wno-unused -Wno-unused-parameter -Wno-stringop-overflow -Wno-stringop-truncation -Wformat=2"
     WARNING_CFLAGS_JVM="$WARNING_CFLAGS_JVM -Wunused-value -Woverloaded-virtual"
-=======
-    WARNING_CFLAGS_JDK="$WARNINGS_ENABLE_ALL"
-    WARNING_CFLAGS_JVM="$WARNINGS_ENABLE_ALL $WARNINGS_ENABLE_ADDITIONAL_JVM"
->>>>>>> refs/remotes/upstream/master
 
   elif test "x$TOOLCHAIN_TYPE" = xclang; then
     if test "x$OPENJDK_TARGET_OS" = xlinux; then

diff --git a/test/hotspot/jtreg/serviceability/sa/TestJmapCore.java b/test/hotspot/jtreg/serviceability/sa/TestJmapCore.java
@@ -37,11 +37,8 @@
 import jdk.test.lib.hprof.HprofParser;
 import jdk.test.lib.process.ProcessTools;
 import jdk.test.lib.process.OutputAnalyzer;
-<<<<<<< HEAD
 import jdk.test.lib.Utils;
-=======
 import jdk.test.lib.util.CoreUtils;
->>>>>>> refs/remotes/upstream/master
 import jtreg.SkippedException;
 
 import java.io.File;