Revision 58250
Added by Michele Artini about 4 years ago
| all_conflicts.html | ||
|---|---|---|
| 37 | 37 |
|
| 38 | 38 |
</div> |
| 39 | 39 |
|
| 40 |
<resolve-conflicts-modal modal-id="resolveConflictsModal" orgs="orgs"></resolve-conflicts-modal> |
|
| 40 |
<resolve-conflicts-modal modal-id="resolveConflictsModal" orgs="orgs" selected-orgs="selectedOrgs"></resolve-conflicts-modal> |
|
Also available in: Unified diff
partial implementation of merge orgs modal