This is an automated email from the ASF dual-hosted git repository.
mbien pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
from 466ffa0813 Merge pull request #7242 from
brunogptavares/import-payara-configurations-after-upgrade
add 3c87d8c2c8 Deconflict some layer registration positions
add 57b7d4982a Merge pull request #7235 from
mbien/resolve-position-conflicts
No new revisions were added by this update.
Summary of changes:
.../src/org/netbeans/modules/cloud/oracle/adm/RunFileADMAction.java | 2 +-
.../src/org/netbeans/modules/jakarta/web/beans/resources/layer.xml | 4 ++--
.../org/netbeans/modules/options/editor/FolderBasedController.java | 2 +-
.../modules/java/file/launcher/indexer/CompilerOptionsIndexer.java | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org
For additional commands, e-mail: commits-h...@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
