Changeset: f7ba42fa9e59 Author: henryjen Date: 2018-06-20 19:22 -0700 URL: http://hg.openjdk.java.net/panama/dev/rev/f7ba42fa9e59 manual merge with default - fix merge error ! src/java.base/share/classes/module-info.java