commit 03c3f174ae28da8159edd2758b87d3b3cc71e848
author Daniel D. Daugherty <dcubed@openjdk.org> Wed Dec 18 18:22:52 2019 -0500
committer Daniel D. Daugherty <dcubed@openjdk.org> Wed Dec 18 18:22:52 2019 -0500
tree a1645b955bbeba2beb4836bb23c40e2879f72b94
parent e788e6dd46c36238f36cb0e1221a9c40c720b7b0

8236226: fix merge error in src/hotspot/share/gc/z/zRootsIterator.cpp

Reviewed-by: dholmes, kbarrett

src/hotspot/share/gc/z/zRootsIterator.cpp

diff --git a/src/hotspot/share/gc/z/zRootsIterator.cpp b/src/hotspot/share/gc/z/zRootsIterator.cpp
index dea2abe..885a9e3 100644
--- a/src/hotspot/share/gc/z/zRootsIterator.cpp
+++ b/src/hotspot/share/gc/z/zRootsIterator.cpp
@@ -44,7 +44,8 @@
 #include "memory/universe.hpp"
 #include "prims/jvmtiExport.hpp"
 #include "prims/resolvedMethodTable.hpp"
-#include "runtime/atomic.hpp"#include "runtime/safepoint.hpp"
+#include "runtime/atomic.hpp"
+#include "runtime/safepoint.hpp"
 #include "runtime/synchronizer.hpp"
 #include "runtime/thread.hpp"
 #include "runtime/vmThread.hpp"