From 03c3f174ae28da8159edd2758b87d3b3cc71e848 Mon Sep 17 00:00:00 2001
From: "Daniel D. Daugherty" <dcubed@openjdk.org>
Date: Wed, 18 Dec 2019 18:22:52 -0500
Subject: [PATCH] 8236226: fix merge error in
 src/hotspot/share/gc/z/zRootsIterator.cpp

Reviewed-by: dholmes, kbarrett
---
 src/hotspot/share/gc/z/zRootsIterator.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/hotspot/share/gc/z/zRootsIterator.cpp b/src/hotspot/share/gc/z/zRootsIterator.cpp
index dea2abe7c71..885a9e39938 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"