# HG changeset patch
# User jjg
# Date 1432241225 25200
# Node ID bce32ab8601e4142f7f842e47323311759721111
# Parent  d3ce7619db2cb059fef9e19973d31126ca7082e2
8080897: tests broken in bad merge
Reviewed-by: darcy

diff -r d3ce7619db2c -r bce32ab8601e langtools/test/tools/javac/proprietary/WarnClass.out
--- a/langtools/test/tools/javac/proprietary/WarnClass.out	Thu May 21 11:41:04 2015 -0700
+++ b/langtools/test/tools/javac/proprietary/WarnClass.out	Thu May 21 13:47:05 2015 -0700
@@ -1,4 +1,4 @@
-WarnClass.java:12:40: compiler.warn.sun.proprietary: sun.misc.Lock
+WarnClass.java:13:40: compiler.warn.sun.proprietary: sun.misc.Lock
 - compiler.err.warnings.and.werror
 1 error
 1 warning
diff -r d3ce7619db2c -r bce32ab8601e langtools/test/tools/javac/proprietary/WarnMethod.out
--- a/langtools/test/tools/javac/proprietary/WarnMethod.out	Thu May 21 11:41:04 2015 -0700
+++ b/langtools/test/tools/javac/proprietary/WarnMethod.out	Thu May 21 13:47:05 2015 -0700
@@ -1,4 +1,4 @@
-WarnMethod.java:14:36: compiler.warn.sun.proprietary: sun.misc.VM
+WarnMethod.java:15:36: compiler.warn.sun.proprietary: sun.misc.VM
 - compiler.err.warnings.and.werror
 1 error
 1 warning
diff -r d3ce7619db2c -r bce32ab8601e langtools/test/tools/javac/proprietary/WarnVariable.out
--- a/langtools/test/tools/javac/proprietary/WarnVariable.out	Thu May 21 11:41:04 2015 -0700
+++ b/langtools/test/tools/javac/proprietary/WarnVariable.out	Thu May 21 13:47:05 2015 -0700
@@ -1,4 +1,4 @@
-WarnVariable.java:14:36: compiler.warn.sun.proprietary: sun.misc.FloatConsts
+WarnVariable.java:15:36: compiler.warn.sun.proprietary: sun.misc.FloatConsts
 - compiler.err.warnings.and.werror
 1 error
 1 warning
diff -r d3ce7619db2c -r bce32ab8601e langtools/test/tools/javac/proprietary/WarnWildcard.out
--- a/langtools/test/tools/javac/proprietary/WarnWildcard.out	Thu May 21 11:41:04 2015 -0700
+++ b/langtools/test/tools/javac/proprietary/WarnWildcard.out	Thu May 21 13:47:05 2015 -0700
@@ -1,4 +1,4 @@
-WarnWildcard.java:13:44: compiler.warn.sun.proprietary: sun.misc.FloatConsts
+WarnWildcard.java:14:44: compiler.warn.sun.proprietary: sun.misc.FloatConsts
 - compiler.err.warnings.and.werror
 1 error
 1 warning