resolve library_call.cpp

dragonwell-project · Oct 19, 2023 · e7d0eef · e7d0eef
1 parent 7100292
commit e7d0eef
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/src/hotspot/share/opto/library_call.cpp b/src/hotspot/share/opto/library_call.cpp
@@ -57,8 +57,6 @@
 #include "utilities/macros.hpp"
 
 
-<<<<<<< HEAD
-=======
 class LibraryIntrinsic : public InlineCallGenerator {
   // Extend the set of intrinsics known to the runtime:
  public:
@@ -346,7 +344,6 @@ class LibraryCallKit : public GraphKit {
   }
 };
 
->>>>>>> dragonwell_extended_upstream/master
 //---------------------------make_vm_intrinsic----------------------------
 CallGenerator* Compile::make_vm_intrinsic(ciMethod* m, bool is_virtual) {
   vmIntrinsics::ID id = m->intrinsic_id();