zowe / zss

Zowe System Services Server for enabling low-level microservices
Eclipse Public License 2.0
13 stars 45 forks source link

Merge v2.x/rc to resolve a conflict #639

Closed ifakhrutdinov closed 12 months ago

ifakhrutdinov commented 12 months ago

Overview

A PR to merge v2.x/rc into v2.x/staging to resolve conflicts in submodules caused by manual changes on the rc branch.