# HG changeset patch
# User shade
# Date 1512063821 -3600
# Node ID d7b4990d04d66adb6b7b5391fe4958aa03be4558
# Parent  f4e069848424ac82d957af9d241714f5760e006d
Remove stray post-merge difference.

diff -r f4e069848424 -r d7b4990d04d6 src/hotspot/share/gc/shared/barrierSet.hpp
--- a/src/hotspot/share/gc/shared/barrierSet.hpp	Thu Nov 30 18:32:06 2017 +0100
+++ b/src/hotspot/share/gc/shared/barrierSet.hpp	Thu Nov 30 18:43:41 2017 +0100
@@ -75,7 +75,6 @@
   // lass derived from BarrierSet.
   template<BarrierSet::Name T> struct GetType;
 
-public:
   // Note: This is not presently the Name corresponding to the
   // concrete class of this object.
   BarrierSet::Name kind() const { return _fake_rtti.concrete_tag(); }